From e2b5a7d9eb5f086bd6d1de9a927819de7a3ca7c1 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Thu, 5 Oct 2023 00:59:22 +0200
Subject: [PATCH 01/50] some functions for tff

---
 .../java/de/uka/ilkd/key/gui/Example.java     | 196 +++++++++++++++
 .../de/uka/ilkd/key/gui/ExampleChooser.java   | 179 --------------
 keyext.api/build.gradle                       |   6 +
 .../org/keyproject/key/FileTypeAdapter.java   |  20 ++
 .../org/keyproject/key/remoteapi/KeyApi.java  |  58 +++++
 .../keyproject/key/remoteapi/KeyApiImpl.java  |  56 +++++
 .../key/remoteapi/KeyExampleApi.java          |  14 ++
 .../keyproject/key/remoteapi/KeyMetaApi.java  |  21 ++
 .../key/remoteapi/MacroDescription.java       |   9 +
 .../org/keyproject/key/remoteapi/Main.java    |  63 +++++
 .../org/keyproject/key/remoteapi/ProofId.java |   4 +
 .../key/remoteapi/ProofLoading.java           |  67 ++++++
 .../keyproject/key/remoteapi/TraceValue.java  |   5 +
 .../keyproject/key/remoteclient/Client.java   |  53 +++++
 .../key/remoteclient/ClientApi.java           | 224 ++++++++++++++++++
 .../key/remoteclient/SimpleClient.java        |   9 +
 settings.gradle                               |   2 +
 17 files changed, 807 insertions(+), 179 deletions(-)
 create mode 100644 key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
 create mode 100644 keyext.api/build.gradle
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
new file mode 100644
index 00000000000..85a85b65df1
--- /dev/null
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
@@ -0,0 +1,196 @@
+package de.uka.ilkd.key.gui;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using the
+ * short file name w/o path.
+ * <p>
+ * Used for displaying files in the examples list w/o prefix
+ */
+public class Example {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Example.class);
+    /**
+     * This constant is accessed by the eclipse based projects.
+     */
+    public static final String KEY_FILE_NAME = "project.key";
+
+    private static final String PROOF_FILE_NAME = "project.proof";
+
+    /**
+     * The default category under which examples range if they do not have {@link #KEY_PATH}
+     * set.
+     */
+    public static final String DEFAULT_CATEGORY_PATH = "Unsorted";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree.
+     */
+    public static final String KEY_PATH = "example.path";
+
+    /**
+     * The {@link Properties} key to specify the name of the example. Directory name if left
+     * open.
+     */
+    public static final String KEY_NAME = "example.name";
+
+    /**
+     * The {@link Properties} key to specify the file for the example. KEY_FILE_NAME by default
+     */
+    public static final String KEY_FILE = "example.file";
+
+    /**
+     * The {@link Properties} key to specify the proof file in the tree. May be left open
+     */
+    public static final String KEY_PROOF_FILE = "example.proofFile";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree. Prefix to specify additional
+     * files to load. Append 1, 2, 3, ...
+     */
+    public static final String ADDITIONAL_FILE_PREFIX = "example.additionalFile.";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree. Prefix to specify export
+     * files which are not shown as tabs in the example wizard but are extracted to Java
+     * projects in the Eclipse integration. Append 1, 2, 3, ...
+     */
+    public static final String EXPORT_FILE_PREFIX = "example.exportFile.";
+
+    public final File exampleFile;
+    public final File directory;
+    public final String description;
+    public final Properties properties;
+
+    public Example(File file) throws IOException {
+        this.exampleFile = file;
+        this.directory = file.getParentFile();
+        this.properties = new Properties();
+        StringBuilder sb = new StringBuilder();
+        extractDescription(file, sb, properties);
+        this.description = sb.toString();
+    }
+
+    public File getDirectory() {
+        return directory;
+    }
+
+    public File getProofFile() {
+        return new File(directory, properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
+    }
+
+    public File getObligationFile() {
+        return new File(directory, properties.getProperty(KEY_FILE, KEY_FILE_NAME));
+    }
+
+    public String getName() {
+        return properties.getProperty(KEY_NAME, directory.getName());
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public File getExampleFile() {
+        return exampleFile;
+    }
+
+    public List<File> getAdditionalFiles() {
+        var result = new ArrayList<File>();
+        int i = 1;
+        while (properties.containsKey(ADDITIONAL_FILE_PREFIX + i)) {
+            result.add(new File(directory, properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
+            i++;
+        }
+        return result;
+    }
+
+    public List<File> getExportFiles() {
+        ArrayList<File> result = new ArrayList<>();
+        int i = 1;
+        while (properties.containsKey(EXPORT_FILE_PREFIX + i)) {
+            result.add(new File(directory, properties.getProperty(EXPORT_FILE_PREFIX + i)));
+            i++;
+        }
+        return result;
+    }
+
+    public String[] getPath() {
+        return properties.getProperty(KEY_PATH, DEFAULT_CATEGORY_PATH).split("/");
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
+
+    public void addToTreeModel(DefaultTreeModel model) {
+        DefaultMutableTreeNode node =
+                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
+        node.add(new DefaultMutableTreeNode(this));
+    }
+
+    private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
+                                             int from) {
+        if (from == path.length) {
+            return root;
+        }
+        Enumeration<?> en = root.children();
+        while (en.hasMoreElements()) {
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) en.nextElement();
+            if (node.getUserObject().equals(path[from])) {
+                return findChild(node, path, from + 1);
+            }
+        }
+        // not found ==> add new
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(path[from]);
+        root.add(node);
+        return findChild(node, path, from + 1);
+    }
+
+    public boolean hasProof() {
+        return properties.containsKey(KEY_PROOF_FILE);
+    }
+
+    private static StringBuilder extractDescription(File file, StringBuilder sb,
+                                                    Properties properties) {
+        try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
+            String line;
+            boolean emptyLineSeen = false;
+            while ((line = r.readLine()) != null) {
+                if (emptyLineSeen) {
+                    sb.append(line).append("\n");
+                } else {
+                    String trimmed = line.trim();
+                    if (trimmed.length() == 0) {
+                        emptyLineSeen = true;
+                    } else if (trimmed.startsWith("#")) {
+                        // ignore
+                    } else {
+                        String[] entry = trimmed.split(" *[:=] *", 2);
+                        if (entry.length > 1) {
+                            properties.put(entry[0], entry[1]);
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            LOGGER.error("", e);
+            return sb;
+        }
+        return sb;
+    }
+}
\ No newline at end of file
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
index f4ee4884408..e37603b344e 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
@@ -37,15 +37,6 @@ public final class ExampleChooser extends JDialog {
      */
     public static final String EXAMPLES_PATH = "examples";
 
-    private static final long serialVersionUID = -4405666868752394532L;
-
-    /**
-     * This constant is accessed by the eclipse based projects.
-     */
-    public static final String KEY_FILE_NAME = "project.key";
-
-    private static final String PROOF_FILE_NAME = "project.proof";
-
     /**
      * Java property name to specify a custom key example folder.
      */
@@ -75,149 +66,7 @@ public final class ExampleChooser extends JDialog {
      */
     private Example selectedExample;
 
-    /**
-     * This class wraps a {@link File} and has a special {@link #toString()} method only using the
-     * short file name w/o path.
-     * <p>
-     * Used for displaying files in the examples list w/o prefix
-     */
-    public static class Example {
-        /**
-         * The default category under which examples range if they do not have {@link #KEY_PATH}
-         * set.
-         */
-        private static final String DEFAULT_CATEGORY_PATH = "Unsorted";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree.
-         */
-        private static final String KEY_PATH = "example.path";
-
-        /**
-         * The {@link Properties} key to specify the name of the example. Directory name if left
-         * open.
-         */
-        private static final String KEY_NAME = "example.name";
-
-        /**
-         * The {@link Properties} key to specify the file for the example. KEY_FILE_NAME by default
-         */
-        private static final String KEY_FILE = "example.file";
-
-        /**
-         * The {@link Properties} key to specify the proof file in the tree. May be left open
-         */
-        private static final String KEY_PROOF_FILE = "example.proofFile";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree. Prefix to specify additional
-         * files to load. Append 1, 2, 3, ...
-         */
-        private static final String ADDITIONAL_FILE_PREFIX = "example.additionalFile.";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree. Prefix to specify export
-         * files which are not shown as tabs in the example wizard but are extracted to Java
-         * projects in the Eclipse integration. Append 1, 2, 3, ...
-         */
-        private static final String EXPORT_FILE_PREFIX = "example.exportFile.";
-
-        private final File exampleFile;
-        private final File directory;
-        private final String description;
-        private final Properties properties;
-
-        public Example(File file) throws IOException {
-            this.exampleFile = file;
-            this.directory = file.getParentFile();
-            this.properties = new Properties();
-            StringBuilder sb = new StringBuilder();
-            extractDescription(file, sb, properties);
-            this.description = sb.toString();
-        }
-
-        public File getDirectory() {
-            return directory;
-        }
 
-        public File getProofFile() {
-            return new File(directory, properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
-        }
-
-        public File getObligationFile() {
-            return new File(directory, properties.getProperty(KEY_FILE, KEY_FILE_NAME));
-        }
-
-        public String getName() {
-            return properties.getProperty(KEY_NAME, directory.getName());
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public File getExampleFile() {
-            return exampleFile;
-        }
-
-        public List<File> getAdditionalFiles() {
-            ArrayList<File> result = new ArrayList<>();
-            int i = 1;
-            while (properties.containsKey(ADDITIONAL_FILE_PREFIX + i)) {
-                result.add(new File(directory, properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
-                i++;
-            }
-            return result;
-        }
-
-        public List<File> getExportFiles() {
-            ArrayList<File> result = new ArrayList<>();
-            int i = 1;
-            while (properties.containsKey(EXPORT_FILE_PREFIX + i)) {
-                result.add(new File(directory, properties.getProperty(EXPORT_FILE_PREFIX + i)));
-                i++;
-            }
-            return result;
-        }
-
-        public String[] getPath() {
-            return properties.getProperty(KEY_PATH, DEFAULT_CATEGORY_PATH).split("/");
-        }
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        public void addToTreeModel(DefaultTreeModel model) {
-            DefaultMutableTreeNode node =
-                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
-            node.add(new DefaultMutableTreeNode(this));
-        }
-
-        private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
-                int from) {
-            if (from == path.length) {
-                return root;
-            }
-            Enumeration<?> en = root.children();
-            while (en.hasMoreElements()) {
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode) en.nextElement();
-                if (node.getUserObject().equals(path[from])) {
-                    return findChild(node, path, from + 1);
-                }
-            }
-            // not found ==> add new
-            DefaultMutableTreeNode node = new DefaultMutableTreeNode(path[from]);
-            root.add(node);
-            return findChild(node, path, from + 1);
-        }
-
-        public boolean hasProof() {
-            return properties.containsKey(KEY_PROOF_FILE);
-        }
-
-    }
 
     // -------------------------------------------------------------------------
     // constructors
@@ -352,34 +201,6 @@ private static String fileAsString(File f) {
         }
     }
 
-    private static StringBuilder extractDescription(File file, StringBuilder sb,
-            Properties properties) {
-        try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
-            String line;
-            boolean emptyLineSeen = false;
-            while ((line = r.readLine()) != null) {
-                if (emptyLineSeen) {
-                    sb.append(line).append("\n");
-                } else {
-                    String trimmed = line.trim();
-                    if (trimmed.length() == 0) {
-                        emptyLineSeen = true;
-                    } else if (trimmed.startsWith("#")) {
-                        // ignore
-                    } else {
-                        String[] entry = trimmed.split(" *[:=] *", 2);
-                        if (entry.length > 1) {
-                            properties.put(entry[0], entry[1]);
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            LOGGER.error("", e);
-            return sb;
-        }
-        return sb;
-    }
 
 
     private void updateDescription() {
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
new file mode 100644
index 00000000000..463b7dbc11a
--- /dev/null
+++ b/keyext.api/build.gradle
@@ -0,0 +1,6 @@
+dependencies {
+    implementation(project(":key.core"))
+    implementation(project(":key.ui"))
+
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
new file mode 100644
index 00000000000..67240012e90
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
@@ -0,0 +1,20 @@
+package org.keyproject.key;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.File;
+import java.io.IOException;
+
+public class FileTypeAdapter extends TypeAdapter<File> {
+    @Override
+    public void write(JsonWriter out, File value) throws IOException {
+        out.value(value.toString());
+    }
+
+    @Override
+    public File read(JsonReader in) throws IOException {
+        return new File(in.nextString());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
new file mode 100644
index 00000000000..76c2d1eefdd
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
@@ -0,0 +1,58 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public interface KeyApi extends KeyExampleApi, KeyMetaApi {
+    //region general server management
+    /**
+     * Shutdown Request (:leftwards_arrow_with_hook:)
+     The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+
+     If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+
+     Request:
+
+     method: ‘shutdown’
+     params: none
+     Response:
+
+     result: null
+     error: code and message set in case an exception happens during shutdown request.
+     */
+    @JsonRequest
+    Void shutdown();
+
+    /**
+     * Exit Notification (:arrow_right:)
+     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘exit’
+     * params: none
+     */
+    @JsonNotification
+    void exit();
+
+
+
+    interface SetTraceParams {
+        /**
+         * The new value that should be assigned to the trace setting.
+         */
+        TraceValue value = null;
+    }
+    /**
+     * SetTrace Notification
+     * A notification that should be used by the client to modify the trace setting of the server.
+     */
+    @JsonNotification
+    void setTrace(SetTraceParams params);
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
new file mode 100644
index 00000000000..0a967998dac
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
@@ -0,0 +1,56 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.api.KeYApi;
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.util.KeYConstants;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment
+class KeyApiImpl implements KeyApi {
+    @Override
+    @JsonRequest
+    public CompletableFuture<List<Example>> examples() {
+        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    }
+
+    @Override
+    public Void shutdown() {
+        return null;
+    }
+
+    @Override
+    public void exit() {
+
+    }
+
+    @Override
+    public void setTrace(SetTraceParams params) {
+
+    }
+
+    @Override
+    public CompletableFuture<String> getVersion() {
+        return CompletableFuture.completedFuture(KeYConstants.VERSION);
+    }
+
+    @Override
+    public CompletableFuture<List<MacroDescription>> getAvailableMacros() {
+        return CompletableFuture.completedFuture(
+                KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
+                        .toList()
+        );
+    }
+
+    @Override
+    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+        return CompletableFuture.completedFuture(
+                KeYApi.getScriptCommandApi().getScriptCommands().stream().toList());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
new file mode 100644
index 00000000000..f1fe80a6dfc
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment("examples")
+public interface KeyExampleApi {
+    @JsonRequest("list")
+    CompletableFuture<List<Example>> examples();
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
new file mode 100644
index 00000000000..e5538b30896
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
@@ -0,0 +1,21 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment("meta")
+public interface KeyMetaApi {
+    @JsonRequest
+    CompletableFuture<String> getVersion();
+
+    @JsonRequest
+    CompletableFuture<List<MacroDescription>> getAvailableMacros();
+
+    @JsonRequest
+    CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
new file mode 100644
index 00000000000..2f34d3e03ed
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.macros.ProofMacro;
+
+public record MacroDescription(String name, String description, String category) {
+    public static MacroDescription from(ProofMacro m) {
+        return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
new file mode 100644
index 00000000000..127b36a702c
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
@@ -0,0 +1,63 @@
+package org.keyproject.key.remoteapi;
+
+import com.google.gson.GsonBuilder;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.keyproject.key.FileTypeAdapter;
+import org.keyproject.key.remoteclient.ClientApi;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+public class Main {
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        var future = launch(System.out, System.in);
+        future.startListening();
+    }
+
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+        var localServices = getLocalServices();
+        var remoteInterfaces = getRemoteInterfaces();
+        var launcherBuilder = new Launcher.Builder<ClientApi>()
+                .setOutput(out)
+                .setInput(in)
+                .traceMessages(new PrintWriter(System.err))
+                .validateMessages(true);
+
+        launcherBuilder.configureGson(Main::configureJson);
+
+        //if (localServices != null && !localServices.isEmpty())
+        launcherBuilder.setLocalService(new KeyApiImpl());
+        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        launcherBuilder.setRemoteInterface(ClientApi.class);
+
+        var launcher = launcherBuilder.create();
+        return launcher;
+    }
+
+    public static void configureJson(GsonBuilder gsonBuilder) {
+        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+    }
+
+    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
+        return Collections.singleton(ClientApi.class);
+      /*  return ServiceLoader.load(ClientService.class)
+                .stream()
+                .map(ServiceLoader.Provider::type)
+                .collect(Collectors.toSet());
+       */
+    }
+
+    private static List<Object> getLocalServices() {
+        return Collections.singletonList(new KeyApiImpl());
+        /*return ServiceLoader.load(KeyService.class)
+                .stream().map(ServiceLoader.Provider::get)
+                .map(it -> (Object) it)
+                .toList();*/
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
new file mode 100644
index 00000000000..65db8662e4e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
@@ -0,0 +1,4 @@
+package org.keyproject.key.remoteapi;
+
+public record ProofId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
new file mode 100644
index 00000000000..7e99ffd0cf5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
@@ -0,0 +1,67 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.api.ProofManagementApi;
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.io.File;
+import java.util.List;
+
+@JsonSegment
+public interface ProofLoading {
+    @JsonRequest ProofId loadExample(String id);
+
+    interface LoadParams {
+        File keyFile;
+        File javaFile;
+
+        List<File> classPath,
+        File bootClassPath, List<File> includes
+    }
+
+    /**
+     * @param keyFile
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadFromKeyFile(File keyFile) throws ProblemLoaderException {
+        return new ProofManagementApi(KeYEnvironment.load(keyFile));
+    }
+
+    /**
+     * @param location
+     * @param classPath
+     * @param bootClassPath
+     * @param includes
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadProof(File location, List<File> classPath,
+                                   File bootClassPath, List<File> includes) throws ProblemLoaderException {
+        return new ProofManagementApi(
+                KeYEnvironment.load(location, classPath, bootClassPath, includes));
+    }
+
+    /**
+     * @param javaSourceCode
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadProof(File javaSourceCode) throws ProblemLoaderException {
+        return loadProof(javaSourceCode, null, null, null);
+    }
+
+    /**
+     * Load a proof file, creates a KeY environment that can be accessed with other methods from
+     * this facade
+     *
+     * @param file Path to the source code folder/file or to a *.proof file
+     * @param classPaths Optionally: Additional specifications for API classes
+     * @param bootClassPath Optionally: Different default specifications for Java API
+     * @param includes Optionally: Additional includes to consider
+     */
+    @JsonRequest ProofId loadProofFile(File file, List<File> classPaths, File bootClassPath,
+                                       List<File> includes);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
new file mode 100644
index 00000000000..1d1d4859e57
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
@@ -0,0 +1,5 @@
+package org.keyproject.key.remoteapi;
+
+public enum TraceValue {
+    Off, Message, All;
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
new file mode 100644
index 00000000000..4fd0b792189
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
@@ -0,0 +1,53 @@
+package org.keyproject.key.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.keyproject.key.remoteapi.Main;
+import org.keyproject.key.remoteapi.KeyApi;
+
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.concurrent.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class Client {
+    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException, TimeoutException {
+        PipedInputStream inClient = new PipedInputStream();
+        PipedOutputStream outClient = new PipedOutputStream();
+        PipedInputStream inServer = new PipedInputStream();
+        PipedOutputStream outServer = new PipedOutputStream();
+
+        inClient.connect(outServer);
+        outClient.connect(inServer);
+
+        Launcher<ClientApi> serverLauncher = Main.launch(outServer, inServer);
+
+        var client = new SimpleClient();
+        Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
+                .setLocalService(client)
+                .setRemoteInterfaces(Collections.singleton(KeyApi.class))
+                .setInput(inClient)
+                .setOutput(outClient)
+                .configureGson(Main::configureJson)
+                .traceMessages(new PrintWriter(System.err))
+                .create();
+
+        Logger logger = Logger.getLogger(StreamMessageProducer.class.getName());
+        logger.setLevel(Level.SEVERE);
+
+        var clientListening = clientLauncher.startListening();
+        var serverListening = serverLauncher.startListening();
+
+        //clientLauncher.getRemoteProxy().examples();
+        serverLauncher.getRemoteProxy().sayHello("Alex");
+
+        serverListening.get(1, TimeUnit.SECONDS);
+        clientListening.get(1, TimeUnit.SECONDS);
+    }
+}
+
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
new file mode 100644
index 00000000000..23c3ddf9e39
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
@@ -0,0 +1,224 @@
+package org.keyproject.key.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
+
+import javax.annotation.Nullable;
+
+@JsonSegment
+public interface ClientApi {
+    @JsonNotification
+    void sayHello(String e);
+
+    /**
+     * LogTrace Notification (:arrow_left:)
+     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * <p>
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘$/logTrace’
+     * params: LogTraceParams defined as follows:
+     */
+    @JsonNotification
+    void logTrace(LogTraceParams params);
+
+    interface LogTraceParams {
+        /**
+         * The message to be logged.
+         */
+        @NonNull
+        String message = null;
+        /**
+         * Additional information that can be computed if the `trace` configuration
+         * is set to `'verbose'`
+         */
+        String verbose = null;
+    }
+
+    //region Window
+
+    /**
+     * ShowMessage Notification (:arrow_left:)
+     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘window/showMessage’
+     * params: ShowMessageParams defined as follows:
+     */
+    @JsonNotification
+    public void ShowMessage(ShowMessageParams params);
+
+    interface ShowMessageParams {
+        /**
+         * The message type. See {@link MessageType}.
+         */
+        MessageType type = null;
+
+        /**
+         * The actual message.
+         */
+        String message = null;
+    }
+
+    enum MessageType {
+
+        Unused,
+        /**
+         * An error message.
+         */
+        Error,
+        /**
+         * A warning message.
+         */
+        Warning,
+        /**
+         * An information message.
+         */
+        Info,
+        /**
+         * A log message.
+         */
+        Log,
+        /**
+         * A debug message.
+         *
+         * @proposed
+         * @since 3.18.0
+         */
+        Debug
+    }
+
+    /**
+     * ShowMessage Request (:arrow_right_hook:)
+     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     */
+    @JsonRequest
+    @Nullable
+    MessageActionItem ShowMessage(ShowMessageRequestParams params);
+
+    interface ShowMessageRequestParams {
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type = null;
+
+        /**
+         * The actual message
+         */
+        String message = null;
+
+        /**
+         * The message action items to present.
+         */
+        MessageActionItem[] actions = new MessageActionItem[0];
+    }
+
+    interface MessageActionItem {
+        /**
+         * A short title like 'Retry', 'Open Log' etc.
+         */
+        String title = null;
+    }
+
+    /**
+     * Show Document Request (:arrow_right_hook:)
+     * New in version 3.16.0
+     * <p>
+     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * <p>
+     * property path (optional): window.showDocument
+     * property type: ShowDocumentClientCapabilities defined as follows:
+     */
+    @JsonRequest
+    ShowDocumentResult showDocument(ShowDocumentParams params);
+
+    interface ShowDocumentParams {
+        /**
+         * The uri to show.
+         */
+        String uri;
+
+        /**
+         * Indicates to show the resource in an external program.
+         * To show, for example, `https://code.visualstudio.com/`
+         * in the default WEB browser set `external` to `true`.
+         */
+        Boolean external;
+
+        /**
+         * An optional property to indicate whether the editor
+         * showing the document should take focus or not.
+         * Clients might ignore this property if an external
+         * program is started.
+         */
+        Boolean takeFocus;
+
+        /**
+         * An optional selection range if the document is a text
+         * document. Clients might ignore the property if an
+         * external program is started or the file is not a text
+         * file.
+         */
+        Range selection;
+    }
+
+    defined
+
+    interface ShowDocumentResult {
+        /**
+         * A boolean indicating if the show was successful.
+         */
+        boolean success;
+    }
+
+    /**
+     * LogMessage Notification(:arrow_left:)
+     * <p>
+     * The log    message notification    is sent    from the    server to    the client    to ask    the client    to log
+     * a particular     message.
+     */
+    interface LogMessageParams {
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type;
+
+        /**
+         * The actual message
+         */
+        String message;
+    }
+
+    /**
+    Create Work
+
+    Done Progress(:arrow_right_hook:)
+
+    The window/workDoneProgress/    create request    is sent    from the    server to    the client    to ask
+    the clie nt     to create    a work    done progress.
+    */
+
+    interface WorkDoneProgressCreateParams {
+        /**
+         * The token to be used to report progress.
+         */
+        ProgressToken token;
+    }
+
+    @JsonNotification workDoneProgressCancel();
+    WorkDoneProgressCancelParams defined
+    interface WorkDoneProgressCancelParams {
+        /**
+         * The token to be used to report progress.
+         */
+        ProgressToken token;
+    }
+
+
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
new file mode 100644
index 00000000000..9578fb8b171
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.remoteclient;
+
+class SimpleClient implements ClientApi {
+
+    @Override
+    public void sayHello(String e) {
+        System.out.format("Hello, %s%n", e);
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index e71fc368308..a7fccaa51b6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,3 +13,5 @@ include 'keyext.ui.testgen'
 include 'keyext.proofmanagement'
 include 'keyext.exploration'
 include 'keyext.slicing'
+
+include 'keyext.api'

From 8f2aec31f6670fd04bac06786b7687fd5a4cd0fc Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 8 Oct 2023 13:43:38 +0200
Subject: [PATCH 02/50] different clients

---
 keyext.api/build.gradle                       |  24 +-
 .../key/{ => api}/FileTypeAdapter.java        |   2 +-
 .../key/{ => api}/remoteapi/KeyApi.java       |   7 +-
 .../key/{ => api}/remoteapi/KeyApiImpl.java   |   8 +-
 .../{ => api}/remoteapi/KeyExampleApi.java    |   2 +-
 .../key/{ => api}/remoteapi/KeyMetaApi.java   |   3 +-
 .../{ => api}/remoteapi/MacroDescription.java |   2 +-
 .../keyproject/key/api/remoteapi/ProofId.java |   4 +
 .../key/api/remoteapi/ProofLoading.java       |  19 ++
 .../key/{ => api}/remoteapi/TraceValue.java   |   2 +-
 .../key/api/remoteclient/ClientApi.java       |  65 +++++
 .../org/keyproject/key/remoteapi/Main.java    |  63 -----
 .../org/keyproject/key/remoteapi/ProofId.java |   4 -
 .../key/remoteapi/ProofLoading.java           |  67 ------
 .../key/remoteclient/ClientApi.java           | 224 ------------------
 .../key/remoteclient/SimpleClient.java        |   9 -
 keyext.api/src/main/python/keyapi/__init__.py |  17 ++
 .../java/org/keyproject/key/api}/Client.java  |  16 +-
 .../org/keyproject/key/api/SimpleClient.java  |  35 +++
 19 files changed, 182 insertions(+), 391 deletions(-)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/FileTypeAdapter.java (93%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyApi.java (92%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyApiImpl.java (88%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyExampleApi.java (89%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyMetaApi.java (85%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/MacroDescription.java (86%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/TraceValue.java (54%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
 create mode 100644 keyext.api/src/main/python/keyapi/__init__.py
 rename keyext.api/src/{main/java/org/keyproject/key/remoteclient => test/java/org/keyproject/key/api}/Client.java (80%)
 create mode 100644 keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java

diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 463b7dbc11a..0f3b2743c24 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -1,6 +1,28 @@
+plugins {
+    id 'application'
+
+    // Used to create a single executable jar file with all dependencies
+    // see task "shadowJar" below
+    // https://imperceptiblethoughts.com/shadow/
+    id 'com.github.johnrengelman.shadow' version "8.1.1"
+}
+
+description "Verification server interface via JSON-RPC"
+
 dependencies {
     implementation(project(":key.core"))
     implementation(project(":key.ui"))
 
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
-}
\ No newline at end of file
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
+    implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
+    implementation("info.picocli:picocli:4.7.5")
+    //for GraalVM annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
+}
+
+
+compileJava {
+    // for GraalVM options.compilerArgs += ["-Aproject=${project.group}/${project.name}"]
+}
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
similarity index 93%
rename from keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
rename to keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
index 67240012e90..9c03fdfae41 100644
--- a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
@@ -1,4 +1,4 @@
-package org.keyproject.key;
+package org.keyproject.key.api;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
similarity index 92%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 76c2d1eefdd..9a6e35fe2eb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,11 +1,8 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.gui.Example;
-import de.uka.ilkd.key.gui.ExampleChooser;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public interface KeyApi extends KeyExampleApi, KeyMetaApi {
@@ -26,7 +23,7 @@ The shutdown request is sent from the client to the server. It asks the server t
      error: code and message set in case an exception happens during shutdown request.
      */
     @JsonRequest
-    Void shutdown();
+    CompletableFuture<Void> shutdown();
 
     /**
      * Exit Notification (:arrow_right:)
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
similarity index 88%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
index 0a967998dac..33ae9c03aba 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.api.KeYApi;
 import de.uka.ilkd.key.gui.Example;
@@ -13,7 +13,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment
-class KeyApiImpl implements KeyApi {
+public class KeyApiImpl implements KeyApi {
     @Override
     @JsonRequest
     public CompletableFuture<List<Example>> examples() {
@@ -21,8 +21,8 @@ public CompletableFuture<List<Example>> examples() {
     }
 
     @Override
-    public Void shutdown() {
-        return null;
+    public CompletableFuture<Void> shutdown() {
+        return CompletableFuture.completedFuture(null);
     }
 
     @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
similarity index 89%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
index f1fe80a6dfc..b1bc064b954 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.gui.Example;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
similarity index 85%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
index e5538b30896..df0112c51f2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
@@ -1,7 +1,6 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
similarity index 86%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
index 2f34d3e03ed..ad6d12babf8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.macros.ProofMacro;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
new file mode 100644
index 00000000000..7d1d4eb5d6b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
@@ -0,0 +1,4 @@
+package org.keyproject.key.api.remoteapi;
+
+public record ProofId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
new file mode 100644
index 00000000000..49081037dc0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
@@ -0,0 +1,19 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+@JsonSegment
+public interface ProofLoading {
+    @JsonRequest
+    ProofId loadExample(String id);
+
+    /**
+     * @param params
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest
+    EnvId load(LoadParams params) throws ProblemLoaderException;
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
similarity index 54%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
index 1d1d4859e57..567b740d6d8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 public enum TraceValue {
     Off, Message, All;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
new file mode 100644
index 00000000000..6f02b10a186
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -0,0 +1,65 @@
+package org.keyproject.key.api.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import javax.annotation.Nullable;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment
+public interface ClientApi {
+    @JsonNotification
+    void sayHello(String e);
+
+    /**
+     * LogTrace Notification (:arrow_left:)
+     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * <p>
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘$/logTrace’
+     * params: LogTraceParams defined as follows:
+     */
+    @JsonNotification
+    void logTrace(LogTraceParams params);
+    //region Window
+
+    /**
+     * ShowMessage Notification (:arrow_left:)
+     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘window/showMessage’
+     * params: ShowMessageParams defined as follows:
+     */
+    @JsonNotification("sm")
+    void showMessage(ShowMessageParams params);
+
+
+
+    /**
+     * ShowMessage Request (:arrow_right_hook:)
+     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     */
+    @JsonRequest
+    @Nullable
+    CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params);
+
+
+    /**
+     * Show Document Request (:arrow_right_hook:)
+     * New in version 3.16.0
+     * <p>
+     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * <p>
+     * property path (optional): window.showDocument
+     * property type: ShowDocumentClientCapabilities defined as follows:
+     */
+    @JsonRequest
+    CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
deleted file mode 100644
index 127b36a702c..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-import com.google.gson.GsonBuilder;
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.keyproject.key.FileTypeAdapter;
-import org.keyproject.key.remoteclient.ClientApi;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-public class Main {
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
-        var future = launch(System.out, System.in);
-        future.startListening();
-    }
-
-    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
-        var localServices = getLocalServices();
-        var remoteInterfaces = getRemoteInterfaces();
-        var launcherBuilder = new Launcher.Builder<ClientApi>()
-                .setOutput(out)
-                .setInput(in)
-                .traceMessages(new PrintWriter(System.err))
-                .validateMessages(true);
-
-        launcherBuilder.configureGson(Main::configureJson);
-
-        //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl());
-        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
-        launcherBuilder.setRemoteInterface(ClientApi.class);
-
-        var launcher = launcherBuilder.create();
-        return launcher;
-    }
-
-    public static void configureJson(GsonBuilder gsonBuilder) {
-        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
-    }
-
-    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
-        return Collections.singleton(ClientApi.class);
-      /*  return ServiceLoader.load(ClientService.class)
-                .stream()
-                .map(ServiceLoader.Provider::type)
-                .collect(Collectors.toSet());
-       */
-    }
-
-    private static List<Object> getLocalServices() {
-        return Collections.singletonList(new KeyApiImpl());
-        /*return ServiceLoader.load(KeyService.class)
-                .stream().map(ServiceLoader.Provider::get)
-                .map(it -> (Object) it)
-                .toList();*/
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
deleted file mode 100644
index 65db8662e4e..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-public record ProofId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
deleted file mode 100644
index 7e99ffd0cf5..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-import de.uka.ilkd.key.api.ProofManagementApi;
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-import java.io.File;
-import java.util.List;
-
-@JsonSegment
-public interface ProofLoading {
-    @JsonRequest ProofId loadExample(String id);
-
-    interface LoadParams {
-        File keyFile;
-        File javaFile;
-
-        List<File> classPath,
-        File bootClassPath, List<File> includes
-    }
-
-    /**
-     * @param keyFile
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadFromKeyFile(File keyFile) throws ProblemLoaderException {
-        return new ProofManagementApi(KeYEnvironment.load(keyFile));
-    }
-
-    /**
-     * @param location
-     * @param classPath
-     * @param bootClassPath
-     * @param includes
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadProof(File location, List<File> classPath,
-                                   File bootClassPath, List<File> includes) throws ProblemLoaderException {
-        return new ProofManagementApi(
-                KeYEnvironment.load(location, classPath, bootClassPath, includes));
-    }
-
-    /**
-     * @param javaSourceCode
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadProof(File javaSourceCode) throws ProblemLoaderException {
-        return loadProof(javaSourceCode, null, null, null);
-    }
-
-    /**
-     * Load a proof file, creates a KeY environment that can be accessed with other methods from
-     * this facade
-     *
-     * @param file Path to the source code folder/file or to a *.proof file
-     * @param classPaths Optionally: Additional specifications for API classes
-     * @param bootClassPath Optionally: Different default specifications for Java API
-     * @param includes Optionally: Additional includes to consider
-     */
-    @JsonRequest ProofId loadProofFile(File file, List<File> classPaths, File bootClassPath,
-                                       List<File> includes);
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
deleted file mode 100644
index 23c3ddf9e39..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.keyproject.key.remoteclient;
-
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-
-import javax.annotation.Nullable;
-
-@JsonSegment
-public interface ClientApi {
-    @JsonNotification
-    void sayHello(String e);
-
-    /**
-     * LogTrace Notification (:arrow_left:)
-     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
-     * <p>
-     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘$/logTrace’
-     * params: LogTraceParams defined as follows:
-     */
-    @JsonNotification
-    void logTrace(LogTraceParams params);
-
-    interface LogTraceParams {
-        /**
-         * The message to be logged.
-         */
-        @NonNull
-        String message = null;
-        /**
-         * Additional information that can be computed if the `trace` configuration
-         * is set to `'verbose'`
-         */
-        String verbose = null;
-    }
-
-    //region Window
-
-    /**
-     * ShowMessage Notification (:arrow_left:)
-     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘window/showMessage’
-     * params: ShowMessageParams defined as follows:
-     */
-    @JsonNotification
-    public void ShowMessage(ShowMessageParams params);
-
-    interface ShowMessageParams {
-        /**
-         * The message type. See {@link MessageType}.
-         */
-        MessageType type = null;
-
-        /**
-         * The actual message.
-         */
-        String message = null;
-    }
-
-    enum MessageType {
-
-        Unused,
-        /**
-         * An error message.
-         */
-        Error,
-        /**
-         * A warning message.
-         */
-        Warning,
-        /**
-         * An information message.
-         */
-        Info,
-        /**
-         * A log message.
-         */
-        Log,
-        /**
-         * A debug message.
-         *
-         * @proposed
-         * @since 3.18.0
-         */
-        Debug
-    }
-
-    /**
-     * ShowMessage Request (:arrow_right_hook:)
-     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
-     */
-    @JsonRequest
-    @Nullable
-    MessageActionItem ShowMessage(ShowMessageRequestParams params);
-
-    interface ShowMessageRequestParams {
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type = null;
-
-        /**
-         * The actual message
-         */
-        String message = null;
-
-        /**
-         * The message action items to present.
-         */
-        MessageActionItem[] actions = new MessageActionItem[0];
-    }
-
-    interface MessageActionItem {
-        /**
-         * A short title like 'Retry', 'Open Log' etc.
-         */
-        String title = null;
-    }
-
-    /**
-     * Show Document Request (:arrow_right_hook:)
-     * New in version 3.16.0
-     * <p>
-     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
-     * <p>
-     * property path (optional): window.showDocument
-     * property type: ShowDocumentClientCapabilities defined as follows:
-     */
-    @JsonRequest
-    ShowDocumentResult showDocument(ShowDocumentParams params);
-
-    interface ShowDocumentParams {
-        /**
-         * The uri to show.
-         */
-        String uri;
-
-        /**
-         * Indicates to show the resource in an external program.
-         * To show, for example, `https://code.visualstudio.com/`
-         * in the default WEB browser set `external` to `true`.
-         */
-        Boolean external;
-
-        /**
-         * An optional property to indicate whether the editor
-         * showing the document should take focus or not.
-         * Clients might ignore this property if an external
-         * program is started.
-         */
-        Boolean takeFocus;
-
-        /**
-         * An optional selection range if the document is a text
-         * document. Clients might ignore the property if an
-         * external program is started or the file is not a text
-         * file.
-         */
-        Range selection;
-    }
-
-    defined
-
-    interface ShowDocumentResult {
-        /**
-         * A boolean indicating if the show was successful.
-         */
-        boolean success;
-    }
-
-    /**
-     * LogMessage Notification(:arrow_left:)
-     * <p>
-     * The log    message notification    is sent    from the    server to    the client    to ask    the client    to log
-     * a particular     message.
-     */
-    interface LogMessageParams {
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type;
-
-        /**
-         * The actual message
-         */
-        String message;
-    }
-
-    /**
-    Create Work
-
-    Done Progress(:arrow_right_hook:)
-
-    The window/workDoneProgress/    create request    is sent    from the    server to    the client    to ask
-    the clie nt     to create    a work    done progress.
-    */
-
-    interface WorkDoneProgressCreateParams {
-        /**
-         * The token to be used to report progress.
-         */
-        ProgressToken token;
-    }
-
-    @JsonNotification workDoneProgressCancel();
-    WorkDoneProgressCancelParams defined
-    interface WorkDoneProgressCancelParams {
-        /**
-         * The token to be used to report progress.
-         */
-        ProgressToken token;
-    }
-
-
-    //endregion
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
deleted file mode 100644
index 9578fb8b171..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.keyproject.key.remoteclient;
-
-class SimpleClient implements ClientApi {
-
-    @Override
-    public void sayHello(String e) {
-        System.out.format("Hello, %s%n", e);
-    }
-}
diff --git a/keyext.api/src/main/python/keyapi/__init__.py b/keyext.api/src/main/python/keyapi/__init__.py
new file mode 100644
index 00000000000..8523f3801f5
--- /dev/null
+++ b/keyext.api/src/main/python/keyapi/__init__.py
@@ -0,0 +1,17 @@
+from keyapi.rpc import JsonRPCHandler, Client
+
+
+class KeyClient(Client):
+    def __int__(self):
+        pass
+
+    def handle(self, res):
+        print(res)
+
+
+class KeyStub(JsonRPCHandler):
+    def __init__(self, input, output):
+        super().__init__(input, output)
+
+    def list_examples(self):
+        return self._send("examples/list", [])
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java b/keyext.api/src/test/java/org/keyproject/key/api/Client.java
similarity index 80%
rename from keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
rename to keyext.api/src/test/java/org/keyproject/key/api/Client.java
index 4fd0b792189..4922de0993a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/Client.java
@@ -1,16 +1,18 @@
-package org.keyproject.key.remoteclient;
+package org.keyproject.key.api;
 
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
-import org.keyproject.key.remoteapi.Main;
-import org.keyproject.key.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintWriter;
 import java.util.Collections;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -24,7 +26,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        Launcher<ClientApi> serverLauncher = Main.launch(outServer, inServer);
+        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer);
 
         var client = new SimpleClient();
         Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
@@ -32,7 +34,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
                 .setRemoteInterfaces(Collections.singleton(KeyApi.class))
                 .setInput(inClient)
                 .setOutput(outClient)
-                .configureGson(Main::configureJson)
+                .configureGson(StartServer::configureJson)
                 .traceMessages(new PrintWriter(System.err))
                 .create();
 
@@ -49,5 +51,3 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         clientListening.get(1, TimeUnit.SECONDS);
     }
 }
-
-
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
new file mode 100644
index 00000000000..3370f6eb31f
--- /dev/null
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -0,0 +1,35 @@
+package org.keyproject.key.api;
+
+import org.keyproject.key.api.remoteclient.*;
+
+import javax.annotation.Nullable;
+import java.util.concurrent.CompletableFuture;
+
+class SimpleClient implements ClientApi {
+
+    @Override
+    public void sayHello(String e) {
+        System.out.format("Hello, %s%n", e);
+    }
+
+    @Override
+    public void logTrace(LogTraceParams params) {
+
+    }
+
+    @Override
+    public void userResponse(ShowMessageParams params) {
+
+    }
+
+    @Nullable
+    @Override
+    public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params) {
+        return null;
+    }
+}

From 963386f76519e5955625cce39a5f9adbbf99a2f3 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 13 Oct 2023 13:26:27 +0200
Subject: [PATCH 03/50] wip

---
 .../org/keyproject/key/api/StartServer.java   | 203 ++++++++++++++++++
 .../keyproject/key/api/remoteapi/EnvId.java   |   8 +
 .../key/api/remoteapi/LoadParams.java         |   8 +
 .../api/remoteclient/LogMessageParams.java    |  15 ++
 .../key/api/remoteclient/LogTraceParams.java  |  19 ++
 .../api/remoteclient/MessageActionItem.java   |   9 +
 .../key/api/remoteclient/MessageType.java     |  28 +++
 .../api/remoteclient/ShowDocumentParams.java  |  35 +++
 .../api/remoteclient/ShowDocumentResult.java  |  10 +
 .../api/remoteclient/ShowMessageParams.java   |  14 ++
 .../ShowMessageRequestParams.java             |  20 ++
 keyext.api/src/main/python/keyapi/rpc.py      |  76 +++++++
 keyext.api/src/main/python/main.py            |  13 ++
 13 files changed, 458 insertions(+)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
 create mode 100644 keyext.api/src/main/python/keyapi/rpc.py
 create mode 100644 keyext.api/src/main/python/main.py

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
new file mode 100644
index 00000000000..26837bb84b6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -0,0 +1,203 @@
+package org.keyproject.key.api;
+
+
+import com.google.gson.GsonBuilder;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
+import org.keyproject.key.api.remoteapi.KeyApiImpl;
+import org.keyproject.key.api.remoteclient.ClientApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+
+import javax.annotation.Nullable;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.10.23)
+ */
+@CommandLine.Command
+public class StartServer implements Runnable {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
+
+    //region CLI arguments
+    @Option(names = "--std", description = "use stdout and stdin for communication")
+    boolean stdStreams;
+    @Option(names = "--trace", description = "use stdout and stdin for communication")
+    boolean enableTracing;
+
+    @Option(names = "--server", paramLabel = "PORT", description = "enables the TCP server mode")
+    @Nullable
+    Integer serverPort;
+
+    @Option(names = "--connectTo", paramLabel = "PORT", description = "enables the TCP client mode")
+    @Nullable
+    Integer clientPort;
+
+
+    @Option(names = "--infile", paramLabel = "FILE or PIPE", description = "read from named pipe or file")
+    @Nullable
+    File inFile;
+
+    @Option(names = "--outfile", paramLabel = "FILE or PIPE", description = "write to named pipe or file")
+    File outFile;
+
+    @Option(names = {"-h", "--help"}, usageHelp = true, description = "display a help message")
+    boolean helpRequested = false;
+
+    @Option(names = "--websocket")
+    boolean websocket;
+    //endregion
+
+    public static void main(String[] args) {
+        new CommandLine(new StartServer()).execute(args);
+    }
+
+    private InputStream in;
+    private OutputStream out;
+
+    private void establishStreams() throws IOException {
+        in = System.in;
+        out = System.out;
+
+        if (stdStreams) {
+            return;
+        }
+
+        if (clientPort != null) {
+            var socket = new Socket(InetAddress.getLocalHost(), clientPort);
+            socket.setKeepAlive(true);
+            socket.setTcpNoDelay(true);
+            in = socket.getInputStream();
+            out = socket.getOutputStream();
+            return;
+        }
+
+        if (serverPort != null) {
+            var server = new ServerSocket(serverPort);
+            LOGGER.info("Waiting on port {}", serverPort);
+            var socket = server.accept();
+            LOGGER.info("Connection to client established: {}", socket.getRemoteSocketAddress());
+            socket.setKeepAlive(true);
+            socket.setTcpNoDelay(true);
+            in = socket.getInputStream();
+            out = socket.getOutputStream();
+            return;
+        }
+
+
+        if (inFile != null) {
+            in = new FileInputStream(inFile);
+        }
+
+        if (outFile != null) {
+            out = new FileOutputStream(outFile);
+        }
+
+        if (out == null || in == null) {
+            throw new IllegalStateException("Could not initialize the streams");
+        }
+    }
+
+
+    @Override
+    public void run() {
+        if (helpRequested) {
+            return;
+        }
+
+        /*
+        var server = new Server();
+        var connector = new ServerConnector();
+        server.addConnector(connector);
+        // Setup the basic application "context" for this application at "/"
+        // This is also known as the handler tree (in jetty speak)
+        var context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/");
+        server.setHandler(context);
+
+        // Initialize javax.websocket layer
+        JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
+        {
+            // Configure defaults for container
+            wsContainer.setDefaultMaxTextMessageBufferSize(65535);
+
+            // Add WebSocket endpoint to javax.websocket layer
+            wsContainer.addEndpoint(WebSocketEndpoint.class);
+        });*/
+
+
+        try {
+            if (websocket) {
+                var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
+                        .setOutput(out)
+                        .setInput(in)
+                        .traceMessages(new PrintWriter(System.err))
+                        .validateMessages(true);
+                launcherBuilder.configureGson(StartServer::configureJson);
+                launcherBuilder.setLocalService(new KeyApiImpl());
+                launcherBuilder.setRemoteInterface(ClientApi.class);
+                launcherBuilder.create().startListening().get();
+            } else {
+                establishStreams();
+                try (var lin = in; var lout = out) {
+                    var listener = launch(lout, lin);
+                    LOGGER.info("JSON-RPC is listening for requests");
+                    listener.startListening().get();
+                }
+            }
+        } catch (IOException | InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void configureJson(GsonBuilder gsonBuilder) {
+        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+    }
+
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+        // var localServices = getLocalServices();
+        // var remoteInterfaces = getRemoteInterfaces();
+        var launcherBuilder = new Launcher.Builder<ClientApi>()
+                .setOutput(out)
+                .setInput(in)
+                .traceMessages(new PrintWriter(System.err))
+                .validateMessages(true);
+
+        launcherBuilder.configureGson(StartServer::configureJson);
+
+        //if (localServices != null && !localServices.isEmpty())
+        launcherBuilder.setLocalService(new KeyApiImpl());
+        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        launcherBuilder.setRemoteInterface(ClientApi.class);
+
+        return launcherBuilder.create();
+    }
+
+
+    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
+        return Collections.singleton(ClientApi.class);
+      /*  return ServiceLoader.load(ClientService.class)
+                .stream()
+                .map(ServiceLoader.Provider::type)
+                .collect(Collectors.toSet());
+       */
+    }
+
+    private static List<Object> getLocalServices() {
+        return Collections.singletonList(new KeyApiImpl());
+        /*return ServiceLoader.load(KeyService.class)
+                .stream().map(ServiceLoader.Provider::get)
+                .map(it -> (Object) it)
+                .toList();*/
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
new file mode 100644
index 00000000000..3a2b5291d66
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.remoteapi;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (06.10.23)
+ */
+public record EnvId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
new file mode 100644
index 00000000000..7eadda846ba
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.remoteapi;
+
+import java.io.File;
+import java.util.List;
+
+public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
new file mode 100644
index 00000000000..7ae00a584e7
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -0,0 +1,15 @@
+package org.keyproject.key.api.remoteclient;
+
+record LogMessageParams(
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type,
+
+        /**
+         * The actual message
+         */
+        String message
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
new file mode 100644
index 00000000000..b5995ff5220
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -0,0 +1,19 @@
+package org.keyproject.key.api.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
+
+public record LogTraceParams(
+        /**
+         * The message to be logged.
+         */
+        @NonNull
+        String messag,
+
+        /**
+         * Additional information that can be computed if the `trace` configuration
+         * is set to `'verbose'`
+         */
+        String verbose
+) {
+
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
new file mode 100644
index 00000000000..df586cac66d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.remoteclient;
+
+public record MessageActionItem(
+        /**
+         * A short title like 'Retry', 'Open Log' etc.
+         */
+        String title
+) {
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
new file mode 100644
index 00000000000..cb8c20dd311
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
@@ -0,0 +1,28 @@
+package org.keyproject.key.api.remoteclient;
+
+public enum MessageType {
+        Unused,
+        /**
+         * An error message.
+         */
+        Error,
+        /**
+         * A warning message.
+         */
+        Warning,
+        /**
+         * An information message.
+         */
+        Info,
+        /**
+         * A log message.
+         */
+        Log,
+        /**
+         * A debug message.
+         *
+         * @proposed
+         * @since 3.18.0
+         */
+        Debug
+    }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
new file mode 100644
index 00000000000..17502b1a910
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -0,0 +1,35 @@
+package org.keyproject.key.api.remoteclient;
+
+import de.uka.ilkd.key.pp.Range;
+
+public record ShowDocumentParams(
+        /**
+         * The uri to show.
+         */
+        String uri,
+
+        /**
+         * Indicates to show the resource in an external program.
+         * To show, for example, `https://code.visualstudio.com/`
+         * in the default WEB browser set `external` to `true`.
+         */
+        Boolean external,
+
+        /**
+         * An optional property to indicate whether the editor
+         * showing the document should take focus or not.
+         * Clients might ignore this property if an external
+         * program is started.
+         */
+        Boolean takeFocus,
+
+        /**
+         * An optional selection range if the document is a text
+         * document. Clients might ignore the property if an
+         * external program is started or the file is not a text
+         * file.
+         */
+        Range selection
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
new file mode 100644
index 00000000000..b91a100858a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowDocumentResult(
+        /**
+         * A boolean indicating if the show was successful.
+         */
+        boolean success
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
new file mode 100644
index 00000000000..9bf22a6f552
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowMessageParams(
+        /**
+         * The message type. See {@link MessageType}.
+         */
+        MessageType type,
+
+        /**
+         * The actual message.
+         */
+        String message) {
+    
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
new file mode 100644
index 00000000000..5e5f4f1410b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -0,0 +1,20 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowMessageRequestParams(
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type,
+
+        /**
+         * The actual message
+         */
+        String message,
+
+        /**
+         * The message action items to present.
+         *
+         */
+        MessageActionItem[] actions
+) {
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/python/keyapi/rpc.py b/keyext.api/src/main/python/keyapi/rpc.py
new file mode 100644
index 00000000000..89dc6f3e041
--- /dev/null
+++ b/keyext.api/src/main/python/keyapi/rpc.py
@@ -0,0 +1,76 @@
+import abc
+import json
+from abc import abstractmethod
+from multiprocessing import Process, SimpleQueue, Lock, Value
+
+
+class Client(abc.ABC):
+    @abstractmethod
+    def handle(self, response):
+        pass
+
+
+class JsonRPCHandler:
+    client: Client
+
+    def __init__(self, in_stream, out_stream):
+        self.input = in_stream
+        self.out = out_stream
+        self.__id = 0
+        self.client: Client
+
+        self._events = dict()
+        self._responses = dict()
+
+        # t: Process = Process(target=self.__read)
+        # t.start()
+
+    def read_message(self):
+        length = 0
+        for clength in self.input.readlines():
+            if clength.startswith("Content-Length:"):
+                length = int(clength[14:])
+                break
+
+        payload = self.input.read(2 + length)
+        r = json.loads(payload)
+        if "id" in r:  # JSON response for request
+            rid = r["id"]
+            # self._responses[rid] = r
+            # if rid in self._events:
+            #    self._events[rid].set()
+        else:  # JSON notification
+            self.client.handle(r)
+        return r
+
+    def __read(self):
+        while True:
+            self.read_message()
+
+    # def __create_event(self, number):
+    #    self._events[number] = Event()
+
+    def _send(self, method, params):
+        self.__id += 1
+        id = self.__id
+        # self.__create_event(self.__id)
+        req = {"jsonrpc": "2.0", "method": method, "params": params, "id": self.__id}
+
+        self._write(json.dumps(req))
+        # self._wait_for(self.__id)
+
+        r = dict()
+        while "id" in r and str(r[id]) != str(id):
+            r = self.read_message()
+        return r
+
+    def _write(self, msg):
+        length = len(msg)
+        self.out.write(f"Content-Length: {length}\r\n")
+        self.out.write("\r\n")
+        self.out.write(msg)
+        self.out.write("\r\n")
+        self.out.flush()
+
+   # def _wait_for(self, rid):
+   #     self._events[rid].wait()
diff --git a/keyext.api/src/main/python/main.py b/keyext.api/src/main/python/main.py
new file mode 100644
index 00000000000..a5cb45321d8
--- /dev/null
+++ b/keyext.api/src/main/python/main.py
@@ -0,0 +1,13 @@
+import socket
+from keyapi import KeyStub, KeyClient
+
+if __name__ == "__main__":
+    target = ("localhost", 5151)
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.connect(target)
+        input = s.makefile("r", newline="\r\n")
+        output = s.makefile("w", newline="\r\n")
+        stub = KeyStub(input, output)
+        stub.client = KeyClient()
+        print(stub.list_examples())

From 3a8512a278d44330a5e415ded8c5d6ebb91999e0 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 15 Oct 2023 17:27:16 +0200
Subject: [PATCH 04/50] Creating an JSON-RPC API

---
 .../java/de/uka/ilkd/key/Identifiable.java    |  11 +
 .../main/java/de/uka/ilkd/key/api/KeYApi.java | 102 ---------
 .../java/de/uka/ilkd/key/api/Matcher.java     | 210 ------------------
 .../de/uka/ilkd/key/api/ProjectedNode.java    |  65 ------
 .../java/de/uka/ilkd/key/api/ProofApi.java    |  90 --------
 .../uka/ilkd/key/api/ProofManagementApi.java  | 129 -----------
 .../ilkd/key/api/ProofScriptCommandCall.java  |  20 --
 .../java/de/uka/ilkd/key/api/ScriptApi.java   | 132 -----------
 .../de/uka/ilkd/key/api/ScriptResult.java     | 114 ----------
 .../de/uka/ilkd/key/api/ScriptResults.java    | 178 ---------------
 .../java/de/uka/ilkd/key/api/SearchNode.java  |  55 -----
 .../uka/ilkd/key/api/VariableAssignments.java | 154 -------------
 .../de/uka/ilkd/key/api/package-info.java     |   9 -
 .../uka/ilkd/key/control/KeYEnvironment.java  | 162 +++++++++-----
 .../ProofMacroFacade.java}                    |  15 +-
 .../scripts/ProofScriptCommandFacade.java}    |  16 +-
 .../main/java/de/uka/ilkd/key/proof/Goal.java |  47 +++-
 .../java/de/uka/ilkd/key/proof/Proof.java     |  12 +-
 .../speclang/njml/ContractLoadingTests.java   |  65 ++----
 .../de/uka/ilkd/key/gui/ExampleChooser.java   |   2 +-
 keyext.api.doc/build.gradle                   |   4 +
 .../src/main/java/ExtractMetaData.java        | 162 ++++++++++++++
 keyext.api/build.gradle                       |   3 +
 .../keyproject/key/api/FileTypeAdapter.java   |  20 --
 .../org/keyproject/key/api/KeyApiImpl.java    | 168 ++++++++++++++
 .../org/keyproject/key/api/StartServer.java   |  56 +----
 .../key/api/adapters/KeyAdapter.java          |  96 ++++++++
 .../key/api/adapters/package-info.java        |   7 +
 .../keyproject/key/api/data/ContractDesc.java |   8 +
 .../keyproject/key/api/data/FunctionDesc.java |  10 +
 .../org/keyproject/key/api/data/GoalText.java |  10 +
 .../keyproject/key/api/data/LoadParams.java   |  14 ++
 .../{remoteapi => data}/MacroDescription.java |   8 +-
 .../key/api/data/MacroStatistic.java          |   8 +
 .../org/keyproject/key/api/data/NodeDesc.java |   8 +
 .../key/api/data/PredicateDesc.java           |   8 +
 .../org/keyproject/key/api/data/PrintId.java  |   8 +
 .../key/api/data/ProblemDefinition.java       |  18 ++
 .../keyproject/key/api/data/ProofLoading.java |  42 ++++
 .../org/keyproject/key/api/data/SortDesc.java |   8 +
 .../key/api/data/StreategyOptions.java        |   8 +
 .../keyproject/key/api/data/TermAction.java   |   8 +
 .../keyproject/key/api/data/TermActionId.java |   8 +
 .../api/{remoteapi => data}/TraceValue.java   |   2 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |   8 +
 .../keyproject/key/api/data/TreeNodeId.java   |   8 +
 .../keyproject/key/api/remoteapi/EnvApi.java  |  31 +++
 .../keyproject/key/api/remoteapi/EnvId.java   |   8 -
 .../{KeyExampleApi.java => ExampleApi.java}   |   2 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |  32 +++
 .../keyproject/key/api/remoteapi/KeyApi.java  |  56 +----
 .../key/api/remoteapi/KeyApiImpl.java         |  56 -----
 .../key/api/remoteapi/LoadParams.java         |   8 -
 .../{KeyMetaApi.java => MetaApi.java}         |  11 +-
 .../key/api/remoteapi/ProofApi.java           |  48 ++++
 .../keyproject/key/api/remoteapi/ProofId.java |   4 -
 .../key/api/remoteapi/ProofLoading.java       |  19 --
 .../key/api/remoteapi/ProofTreeApi.java       |  26 +++
 .../key/api/remoteapi/ServerManagement.java   |  60 +++++
 .../key/api/remoteclient/ClientApi.java       |   2 +-
 .../org/keyproject/key/api/SimpleClient.java  |   2 +-
 .../key/api/{Client.java => TestRpc.java}     |  45 +++-
 settings.gradle                               |   1 +
 63 files changed, 1093 insertions(+), 1614 deletions(-)
 create mode 100644 key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
 rename key.core/src/main/java/de/uka/ilkd/key/{api/ProofMacroApi.java => macros/ProofMacroFacade.java} (83%)
 rename key.core/src/main/java/de/uka/ilkd/key/{api/ProofScriptCommandApi.java => macros/scripts/ProofScriptCommandFacade.java} (79%)
 create mode 100644 keyext.api.doc/build.gradle
 create mode 100644 keyext.api.doc/src/main/java/ExtractMetaData.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/MacroDescription.java (72%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/TraceValue.java (54%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyExampleApi.java => ExampleApi.java} (91%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyMetaApi.java => MetaApi.java} (64%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
 rename keyext.api/src/test/java/org/keyproject/key/api/{Client.java => TestRpc.java} (57%)

diff --git a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
new file mode 100644
index 00000000000..3be1d2528d8
--- /dev/null
+++ b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
@@ -0,0 +1,11 @@
+package de.uka.ilkd.key;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public interface Identifiable {
+    default String identification() {
+        return getClass().getName() + "_" + hashCode();
+    }
+}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
deleted file mode 100644
index dc89908c39c..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.io.File;
-import java.util.List;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.util.KeYConstants;
-
-/**
- * The Entry Point.
- * <p>
- * This facility is the entry point to the different KeY apis. Currently it support the
- * bootstrapping of the {@link KeYEnvironment} and the loading of proofs.
- * <p>
- * Created at 6.4.17
- *
- * @author Sarah Grebing
- * @author Alexander Weigl
- * @see ProofScriptCommandApi
- */
-public abstract class KeYApi {
-    private static final ProofMacroApi proofMacroApi = new ProofMacroApi();
-    private static final ProofScriptCommandApi scriptCommandApi = new ProofScriptCommandApi();
-
-    /**
-     * Create a new KeY API and create the sub APIs
-     */
-    private KeYApi() {
-    }
-
-    /**
-     *
-     * @return
-     */
-    public static String getVersion() {
-        return KeYConstants.INTERNAL_VERSION;
-    }
-
-
-    /**
-     * @return non-null
-     */
-    public static ProofScriptCommandApi getScriptCommandApi() {
-        return scriptCommandApi;
-    }
-
-    /**
-     * @return a non-null references to the macro api
-     */
-    public static ProofMacroApi getMacroApi() {
-        return proofMacroApi;
-    }
-
-    /**
-     * @param keyFile
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadFromKeyFile(File keyFile) throws ProblemLoaderException {
-        return new ProofManagementApi(KeYEnvironment.load(keyFile));
-    }
-
-    /**
-     * @param location
-     * @param classPath
-     * @param bootClassPath
-     * @param includes
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadProof(File location, List<File> classPath,
-            File bootClassPath, List<File> includes) throws ProblemLoaderException {
-        return new ProofManagementApi(
-            KeYEnvironment.load(location, classPath, bootClassPath, includes));
-    }
-
-    /**
-     * @param javaSourceCode
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadProof(File javaSourceCode) throws ProblemLoaderException {
-        return loadProof(javaSourceCode, null, null, null);
-    }
-
-    /**
-     * Load a proof file, creates a KeY environment that can be accessed with other methods from
-     * this facade
-     *
-     * @param file Path to the source code folder/file or to a *.proof file
-     * @param classPaths Optionally: Additional specifications for API classes
-     * @param bootClassPath Optionally: Different default specifications for Java API
-     * @param includes Optionally: Additional includes to consider
-     */
-    public abstract void loadProofFile(File file, List<File> classPaths, File bootClassPath,
-            List<File> includes);
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java b/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
deleted file mode 100644
index 2c628c45ff2..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.*;
-
-import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.logic.Name;
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.logic.SequentFormula;
-import de.uka.ilkd.key.logic.op.SchemaVariable;
-import de.uka.ilkd.key.nparser.KeyAst;
-import de.uka.ilkd.key.nparser.KeyIO;
-import de.uka.ilkd.key.nparser.ParsingFacade;
-import de.uka.ilkd.key.rule.*;
-import de.uka.ilkd.key.rule.inst.SVInstantiations;
-import de.uka.ilkd.key.rule.match.vm.VMTacletMatcher;
-
-import org.key_project.util.collection.ImmutableArray;
-import org.key_project.util.collection.ImmutableList;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Matcher to deal with matching a string pattern against a sequent
- *
- * @author S.Grebing
- */
-public class Matcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Matcher.class);
-    private final ProofApi api;
-
-    /**
-     * Creates a new matcher for the given proof and environment.
-     *
-     * @param api reference to proof api in order to get access to the key environment
-     */
-    public Matcher(ProofApi api) {
-        this.api = api;
-    }
-
-    /**
-     * Matches a sequent against a sequent pattern (a schematic sequent) returns a list of Nodes
-     * containing matching results from where the information about instantiated schema variables
-     * can be extracted. If no match was possible the list is exmpt.
-     *
-     * @param pattern a string representation of the pattern sequent against which the current
-     *        sequent should be matched
-     * @param currentSeq current concrete sequent
-     * @param assignments variables appearing in the pattern as schemavariables with their
-     *        corresponding type in KeY
-     * @return List of VariableAssignments (possibly empty if no match was found)
-     */
-    // List of VarAssignment
-    public List<VariableAssignments> matchPattern(String pattern, Sequent currentSeq,
-            VariableAssignments assignments) {
-        // copy services in order to not accidently set assignments and namespace for environment
-        Services copyServices = api.getEnv().getServices().copy(false);
-        // Aufbau der Deklarationen fuer den NameSpace
-        buildNameSpace(assignments, copyServices);
-        // Zusammenbau des Pseudotaclets
-        // Parsen des Taclets
-        String patternString = "matchPattern{\\assumes(" + pattern + ") \\find (==>)  \\add (==>)}";
-
-        Taclet t = parseTaclet(patternString, copyServices);
-
-        // Build Matcher for Matchpattern
-        VMTacletMatcher tacletMatcher = new VMTacletMatcher(t);
-
-        // patternSequent should not be null, as we have created it
-        assert t.ifSequent() != null;
-        Sequent patternSeq = t.ifSequent();
-        int asize = patternSeq.antecedent().size();
-        int size = asize + patternSeq.succedent().size();
-        // Iterator durch die Pattern-Sequent
-
-        List<SearchNode> finalCandidates = new ArrayList<>(100);
-        if (size > 0) {
-            // Iteratoren durch die Sequent
-            ImmutableArray<IfFormulaInstantiation> antecCand =
-                IfFormulaInstSeq.createList(currentSeq, true, copyServices);
-            ImmutableArray<IfFormulaInstantiation> succCand =
-                IfFormulaInstSeq.createList(currentSeq, false, copyServices);
-
-            SequentFormula[] patternArray = new SequentFormula[patternSeq.size()];
-            int i = 0;
-            for (SequentFormula fm : patternSeq) {
-                patternArray[i++] = fm;
-            }
-
-
-            Queue<SearchNode> queue = new LinkedList<>();
-            // init
-            queue.add(new SearchNode(patternArray, asize));
-
-
-            while (!queue.isEmpty()) {
-                SearchNode node = queue.remove();
-                boolean inAntecedent = node.isAntecedent();
-                LOGGER.debug(inAntecedent ? "In Antec: " : "In Succ");
-
-                IfMatchResult ma = tacletMatcher.matchIf((inAntecedent ? antecCand : succCand),
-                    node.getPatternTerm(), node.getMatchConditions(), copyServices);
-
-                if (!ma.getMatchConditions().isEmpty()) {
-                    ImmutableList<MatchConditions> testma = ma.getMatchConditions();
-
-                    for (MatchConditions matchConditions : testma) {
-                        SearchNode sn = new SearchNode(node, matchConditions);
-                        if (sn.isFinished()) {
-                            finalCandidates.add(sn);
-                        } else {
-                            queue.add(sn);
-                        }
-                    }
-                } else {
-                    LOGGER.debug("Pattern Empty");
-                }
-            }
-        }
-        List<VariableAssignments> matches = new ArrayList<>();
-        if (!finalCandidates.isEmpty()) {
-            for (SearchNode finalCandidate : finalCandidates) {
-                VariableAssignments va = extractAssignments(finalCandidate, assignments);
-                matches.add(va);
-            }
-        }
-        return matches;
-    }
-
-    /**
-     * Extract the matching results from each SearchNode and tranform these to Variable Assigments
-     *
-     * @param sn SearchNode
-     * @return VariableAssigments containing the assignments fo matching results to schemavariables
-     */
-    private VariableAssignments extractAssignments(SearchNode sn, VariableAssignments assignments) {
-        VariableAssignments va = new VariableAssignments();
-        SVInstantiations insts = sn.getInstantiations();
-        Set<String> varNames = assignments.getTypeMap().keySet();
-        for (String varName : varNames) {
-            SchemaVariable sv = insts.lookupVar(new Name(varName));
-            Object value = insts.getInstantiation(sv);
-            va.addAssignmentWithType(varName, value, assignments.getTypeMap().get(varName));
-        }
-        return va;
-
-    }
-
-    /**
-     * Adds the variables of VariableAssignments to the namespace
-     *
-     * @param assignments VariabelAssignments containing variable names and types
-     */
-    private void buildNameSpace(VariableAssignments assignments, Services services) {
-        String decalarations = buildDecls(assignments);
-        parseDecls(decalarations, services);
-
-    }
-
-    /**
-     * Builds a string that is used to create a new schemavariable declaration for the matchpattern
-     *
-     * @param assignments varaiables appearing as schema varaibels in the match pattern and their
-     *        types (in KeY)
-     * @return a String representing the declaration part of a taclet for teh matchpattern
-     */
-    private String buildDecls(VariableAssignments assignments) {
-        Map<String, VariableAssignments.VarType> typeMap = assignments.getTypeMap();
-        String schemaVars = "\\schemaVariables {\n";
-        final List<String> strn = new ArrayList<>();
-
-        typeMap.forEach((id, type) -> strn.add(toDecl(id, type)));
-        schemaVars += String.join("\n", strn);
-        schemaVars += "}";
-        LOGGER.debug("Schema Variables: {}", schemaVars);
-        return schemaVars;
-    }
-
-    private String toDecl(String id, VariableAssignments.VarType type) {
-        return type.getKeYDeclarationPrefix() + " " + id + ";";
-    }
-
-    /**
-     * Parse the declaration string for the current pattern and add the variables to the namespace
-     *
-     * @param s declaration part of a taclet
-     */
-    public void parseDecls(String s, Services services) {
-        try {
-            KeyIO io = new KeyIO(services);
-            KeyAst.File ctx = ParsingFacade.parseFile(CharStreams.fromString(s));
-            io.evalDeclarations(ctx);
-        } catch (Exception e) {
-            LOGGER.error("Exception while Parsing.", e);
-        }
-    }
-
-    private Taclet parseTaclet(String s, Services services) {
-        KeyIO io = new KeyIO(services);
-        KeyAst.File ctx = ParsingFacade.parseFile(CharStreams.fromString(s));
-        io.evalDeclarations(ctx);
-        io.evalFuncAndPred(ctx);
-        return io.findTaclets(ctx).get(0);
-    }
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
deleted file mode 100644
index d255acb757a..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.NodeInfo;
-
-/**
- * Wrapper for a proof node with utilities methods to
- *
- * @author Sarah Grebing
- * @author Alexander Weigl
- */
-public class ProjectedNode {
-
-    private final Node proofNode;
-
-    private final ProjectedNode parent;
-
-    /**
-     * Creates the wrapper object for a proof node
-     *
-     * @param node
-     * @param parent
-     */
-    public ProjectedNode(Node node, ProjectedNode parent) {
-        this.proofNode = node;
-        this.parent = parent;
-    }
-
-    /**
-     * Return the sequent of a proof node
-     *
-     * @return de.uka.ilkd.key.logic.Sequent s
-     */
-    public Sequent getSequent() {
-        return proofNode.sequent();
-    }
-
-    public ProjectedNode getParent() {
-        return this.parent;
-    }
-
-    public boolean isRoot() {
-        return getParent() == null;
-    }
-
-    public NodeInfo getNodeInfo() {
-        return proofNode.getNodeInfo();
-    }
-
-    public boolean isPseudoNode() {
-        return proofNode == null;
-    }
-
-    public Node getProofNode() {
-        return proofNode;
-    }
-
-    public static ProjectedNode pseudoRoot() {
-        return new ProjectedNode(null, null);
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
deleted file mode 100644
index 9a33c3a93b9..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.Goal;
-import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.proof.mgt.RuleJustification;
-import de.uka.ilkd.key.rule.BuiltInRule;
-import de.uka.ilkd.key.rule.NoPosTacletApp;
-import de.uka.ilkd.key.rule.OneStepSimplifier;
-import de.uka.ilkd.key.util.MiscTools;
-
-import org.key_project.util.collection.ImmutableList;
-
-/**
- * @author Alexander Weigl
- * @version 1 (21.04.17)
- */
-public class ProofApi {
-    private final KeYEnvironment<?> env;
-    private final Proof proof;
-
-    public ProofApi(Proof proof, KeYEnvironment<?> currentEnv) {
-        this.proof = proof;
-        this.env = currentEnv;
-    }
-
-    public ScriptApi getScriptApi() {
-        return new ScriptApi(this);
-    }
-
-    /**
-     * Save current Proof-> ProofApi
-     */
-    public void saveProof() throws IOException {
-        // TODO
-    }
-
-    public KeYEnvironment<?> getEnv() {
-        return env;
-    }
-
-    public Proof getProof() {
-        return proof;
-    }
-
-    public List<ProjectedNode> getOpenGoals() {
-        ImmutableList<Goal> goals = proof.openGoals();
-        return goals.stream().map(g -> new ProjectedNode(g.node(), null))
-                .collect(Collectors.toList());
-    }
-
-    public ProjectedNode getFirstOpenGoal() {
-        return getOpenGoals().get(0);
-    }
-
-    public Set<String> getRules() {
-        Set<String> s = new TreeSet<>();
-        Goal goal = proof.getSubtreeGoals(proof.root()).head();
-
-        for (final BuiltInRule br : goal.ruleAppIndex().builtInRuleAppIndex().builtInRuleIndex()
-                .rules()) {
-            s.add(br.displayName());
-        }
-
-        Set<NoPosTacletApp> set = goal.ruleAppIndex().tacletIndex().allNoPosTacletApps();
-        OneStepSimplifier simplifier = MiscTools.findOneStepSimplifier(goal.proof());
-        if (simplifier != null && !simplifier.isShutdown()) {
-            set.addAll(simplifier.getCapturedTaclets());
-        }
-
-        for (final NoPosTacletApp app : set) {
-            RuleJustification just = goal.proof().mgt().getJustification(app);
-            if (just == null) {
-                continue; // do not break system because of this
-            }
-            s.add(app.taclet().displayName());
-        }
-
-        return s;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
deleted file mode 100644
index 6ef8191acf3..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.java.abstraction.KeYJavaType;
-import de.uka.ilkd.key.logic.op.IObserverFunction;
-import de.uka.ilkd.key.proof.init.ProofInputException;
-import de.uka.ilkd.key.proof.init.ProofOblInput;
-import de.uka.ilkd.key.speclang.Contract;
-import de.uka.ilkd.key.util.KeYTypeUtil;
-
-import org.key_project.util.collection.ImmutableSet;
-
-/**
- * This class serves as a facade to all functionalities that are needed for proof management, i.e.,
- * loading proof files, retrieving the proof obligations
- *
- * @author Sarah Grebing.
- */
-public class ProofManagementApi {
-    private final KeYEnvironment<?> currentEnv;
-    private final List<Contract> proofContracts = new ArrayList<>();
-    private HashSet<String> ruleNames;
-
-    public ProofManagementApi(KeYEnvironment<?> env) {
-        currentEnv = env;
-    }
-
-    public Services getServices() {
-        return currentEnv.getServices();
-    }
-
-    /**
-     * Retrieve a list of all available contracts
-     *
-     * @return {@link List<Contract>}; can be null if no file was loaded before (we should throw an
-     *         exception here)
-     */
-    public List<Contract> getProofContracts() {
-        if (proofContracts.isEmpty()) {
-            buildContracts();
-        }
-        return proofContracts;
-    }
-
-    /**
-     * constructs the possible proof contracts from the java info in the environment.
-     */
-    private void buildContracts() {
-        proofContracts.clear();
-        Set<KeYJavaType> kjts = currentEnv.getJavaInfo().getAllKeYJavaTypes();
-        for (KeYJavaType type : kjts) {
-            if (!KeYTypeUtil.isLibraryClass(type)) {
-                ImmutableSet<IObserverFunction> targets =
-                    currentEnv.getSpecificationRepository().getContractTargets(type);
-                for (IObserverFunction target : targets) {
-                    ImmutableSet<Contract> contracts =
-                        currentEnv.getSpecificationRepository().getContracts(type, target);
-                    for (Contract contract : contracts) {
-                        proofContracts.add(contract);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param contract
-     * @return
-     * @throws ProofInputException
-     */
-    public ProofApi startProof(ProofOblInput contract) throws ProofInputException {
-        return new ProofApi(currentEnv.createProof(contract), currentEnv);
-    }
-
-    /**
-     * @param contract
-     * @return
-     * @throws ProofInputException
-     */
-    public ProofApi startProof(Contract contract) throws ProofInputException {
-        return startProof(contract.createProofObl(currentEnv.getInitConfig(), contract));
-    }
-
-    public ProofApi getLoadedProof() {
-        return new ProofApi(currentEnv.getLoadedProof(), currentEnv);
-    }
-
-    /**
-     * Constructs a set containing all names of a taclets that are registered in the current
-     * environment.
-     * <p>
-     * The result is cached to speed up further calls.s
-     *
-     * @return always returns a non-null hash set.
-     */
-    public Set<String> getRuleNames() {
-        if (ruleNames == null) {
-            ruleNames = new HashSet<>();
-            currentEnv.getInitConfig().activatedTaclets()
-                    .forEach(taclet -> ruleNames.add(taclet.displayName()));
-
-            currentEnv.getInitConfig().builtInRules().forEach(t -> ruleNames.add(t.displayName()));
-        }
-        return ruleNames;
-    }
-
-    /*
-     * public KeYApi.CommandType getCommandType(String identifier) { if
-     * (KeYApi.getMacroApi().getMacro(identifier) != null) { return KeYApi.CommandType.MACRO; }
-     *
-     * if (KeYApi.getScriptCommandApi().getScriptCommands(identifier) != null) { return
-     * KeYApi.CommandType.SCRIPT; }
-     *
-     * if (getRuleNames().contains(identifier)) { return KeYApi.CommandType.RULE; }
-     *
-     * return KeYApi.CommandType.UNKNOWN; }
-     *
-     * enum CommandType { SCRIPT, RULE, MACRO, UNKNOWN; }
-     */
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
deleted file mode 100644
index 42c2e08f405..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-
-/**
- * @param <T>
- * @author Alexander Weigl
- */
-public class ProofScriptCommandCall<T> {
-    final T parameter;
-    final ProofScriptCommand<T> command;
-
-    public ProofScriptCommandCall(ProofScriptCommand<T> command, T arguments) {
-        parameter = arguments;
-        this.command = command;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
deleted file mode 100644
index 7e5a8c5841b..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-
-import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.logic.Term;
-import de.uka.ilkd.key.macros.scripts.EngineState;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.macros.scripts.ScriptException;
-import de.uka.ilkd.key.proof.Goal;
-import de.uka.ilkd.key.proof.Node;
-
-import org.key_project.util.collection.ImmutableList;
-
-/**
- * This API class offers methods to apply script commands and match commands
- *
- * @author Alexander Weigl
- * @author S. Grebing
- */
-public class ScriptApi {
-    private final ProofApi api;
-    private final EngineState state;
-    private final Matcher matcher;
-
-    public ScriptApi(ProofApi proofApi) {
-        api = proofApi;
-        state = new EngineState(api.getProof());
-        matcher = new Matcher(api);
-    }
-
-    /**
-     * Matches a sequent against a sequent pattern (a schematic sequent) returns a list of Nodes
-     * containing matching results from where the information about instantiated schema variables
-     * can be extracted. If no match was possible the list is exmpt.
-     *
-     * @param pattern a string representation of the pattern sequent against which the current
-     *        sequent should be matched
-     * @param currentSeq current concrete sequent
-     * @param assignments variables appearing in the pattern as schemavariables with their
-     *        corresponding type in KeY
-     * @return List of VariableAssignments (possibly empty if no match was found)
-     */
-    public List<VariableAssignments> matchPattern(String pattern, Sequent currentSeq,
-            VariableAssignments assignments) {
-        return matcher.matchPattern(pattern, currentSeq, assignments);
-    }
-
-    /**
-     * Execute ScriptCommand onto goal node
-     *
-     * @param call to be applied with parameters set
-     * @param onNode the starting node
-     * @return List of new proof goals (possibly empty) Should throw an Exception if command not
-     *         applicable?
-     */
-    public <T> ScriptResults executeScriptCommand(ProofScriptCommandCall<T> call,
-            ProjectedNode onNode) throws ScriptException, InterruptedException {
-        // TODO VariableAssignments should be in instantiateCommand
-
-        state.setGoal(onNode.getProofNode());
-        call.command.execute((AbstractUserInterfaceControl) api.getEnv().getUi(), call.parameter,
-            state);
-
-        ImmutableList<Goal> goals = api.getProof().getSubtreeGoals(onNode.getProofNode());
-        // TODO filter for open goals if necessary
-        ScriptResults sr = new ScriptResults();
-
-        goals.forEach(g -> sr.add(ScriptResult.create(g.node(), onNode, call)));
-
-        return sr;
-    }
-
-    /**
-     * Evaluate the arguments passed to a command
-     *
-     * @param arguments
-     * @param <T>
-     * @return
-     */
-    public <T> ProofScriptCommandCall<T> instantiateCommand(ProofScriptCommand<T> command,
-            Map<String, String> arguments) throws Exception {
-        return new ProofScriptCommandCall<>(command, command.evaluateArguments(state, arguments));
-    }
-
-
-    /**
-     *
-     * @param term
-     * @param assignments
-     * @return
-     * @throws Exception either for Syntax or Type error
-     */
-    public Term toTerm(String term, VariableAssignments assignments) throws Exception {
-        // TODO
-        return null;
-    }
-
-    /**
-     * ~> Beweisbaum -> Shallow Copy hier implementieren
-     *
-     * @param root
-     * @param end
-     * @return
-     */
-    public ProjectedNode getIntermediateTree(ScriptResults root, ScriptResults end) {
-        /*
-         * Baum suche, startet bei allen Nodes von root.
-         *
-         * Endet sobald ein Node von end erreicht ist.
-         */
-        ProjectedNode pseudoRoot = ProjectedNode.pseudoRoot();
-        Queue<Node> queue = new LinkedList<>();
-        root.forEach(r -> queue.add(r.getProjectedNode().getProofNode()));
-
-        while (!queue.isEmpty()) {
-
-        }
-
-
-        return pseudoRoot;
-    }
-
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
deleted file mode 100644
index b5213cb0133..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.List;
-import java.util.Set;
-
-import de.uka.ilkd.key.java.PositionInfo;
-import de.uka.ilkd.key.proof.Node;
-
-/**
- * Object that represents one result goal of a script command It holds a reference to its parent
- * node and to the list of variables and their values for this result Created by S. Grebing
- */
-public class ScriptResult {
-
-    /**
-     * The current goal node
-     */
-    private ProjectedNode newNode;
-
-    /**
-     * the parent scriptNode to which the scriptcommand was applied
-     */
-    private ProjectedNode parentNode;
-
-    /**
-     * The scriptcommand that lead to this result
-     */
-    private ProofScriptCommandCall<?> call;
-
-    /**
-     * The reference to the variableassingments for this result
-     */
-    // private VariableAssignments assignments;
-
-    /**
-     * The list of labels for the result
-     */
-    private Set<List<String>> labels;
-
-    /**
-     * List with line numbers
-     */
-    private List<PositionInfo> linenumbers;
-
-    // getLineNumbers hier
-
-    /**
-     *
-     */
-    ScriptResult() {
-        // nulls
-    }
-
-    public static <T> ScriptResult create(Node node, ProjectedNode onNode,
-            ProofScriptCommandCall<T> call) {
-        ScriptResult sr = new ScriptResult();
-        sr.parentNode = onNode;
-        sr.newNode = new ProjectedNode(node, onNode);
-        sr.call = call;
-        return sr;
-    }
-
-    public ProjectedNode getNewNode() {
-        return newNode;
-    }
-
-    public ScriptResult setNewNode(ProjectedNode newNode) {
-        this.newNode = newNode;
-        return this;
-    }
-
-    public ProjectedNode getParentNode() {
-        return parentNode;
-    }
-
-    public ScriptResult setParentNode(ProjectedNode parentNode) {
-        this.parentNode = parentNode;
-        return this;
-    }
-
-    public ProofScriptCommandCall<?> getCall() {
-        return call;
-    }
-
-    public ScriptResult setCall(ProofScriptCommandCall<?> call) {
-        this.call = call;
-        return this;
-    }
-
-    public Set<List<String>> getLabels() {
-        return labels;
-    }
-
-    public ScriptResult setLabels(Set<List<String>> labels) {
-        this.labels = labels;
-        return this;
-    }
-
-    public List<PositionInfo> getLinenumbers() {
-        return linenumbers;
-    }
-
-    public ScriptResult setLinenumbers(List<PositionInfo> linenumbers) {
-        this.linenumbers = linenumbers;
-        return this;
-    }
-
-    public ProjectedNode getProjectedNode() {
-        return getNewNode();
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
deleted file mode 100644
index efc2bb66b2f..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
-
-/**
- * @author Alexander Weigl
- * @version 1 (21.04.17)
- */
-public class ScriptResults implements List<ScriptResult> {
-    private final List<ScriptResult> delegated = new ArrayList<>();
-
-    @Override
-    public int size() {
-        return delegated.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return delegated.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return delegated.contains(o);
-    }
-
-    @Override
-    public Iterator<ScriptResult> iterator() {
-        return delegated.iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return delegated.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return delegated.toArray(a);
-    }
-
-    @Override
-    public boolean add(ScriptResult scriptResult) {
-        return delegated.add(scriptResult);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return delegated.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return delegated.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends ScriptResult> c) {
-        return delegated.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends ScriptResult> c) {
-        return delegated.addAll(index, c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return delegated.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return delegated.retainAll(c);
-    }
-
-    @Override
-    public void replaceAll(UnaryOperator<ScriptResult> operator) {
-        delegated.replaceAll(operator);
-    }
-
-    @Override
-    public void sort(Comparator<? super ScriptResult> c) {
-        delegated.sort(c);
-    }
-
-    @Override
-    public void clear() {
-        delegated.clear();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return delegated.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return delegated.hashCode();
-    }
-
-    @Override
-    public ScriptResult get(int index) {
-        return delegated.get(index);
-    }
-
-    @Override
-    public ScriptResult set(int index, ScriptResult element) {
-        return delegated.set(index, element);
-    }
-
-    @Override
-    public void add(int index, ScriptResult element) {
-        delegated.add(index, element);
-    }
-
-    @Override
-    public ScriptResult remove(int index) {
-        return delegated.remove(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return delegated.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return delegated.lastIndexOf(o);
-    }
-
-    @Override
-    public ListIterator<ScriptResult> listIterator() {
-        return delegated.listIterator();
-    }
-
-    @Override
-    public ListIterator<ScriptResult> listIterator(int index) {
-        return delegated.listIterator(index);
-    }
-
-    @Override
-    public List<ScriptResult> subList(int fromIndex, int toIndex) {
-        return delegated.subList(fromIndex, toIndex);
-    }
-
-    @Override
-    public Spliterator<ScriptResult> spliterator() {
-        return delegated.spliterator();
-    }
-
-    @Override
-    public boolean removeIf(Predicate<? super ScriptResult> filter) {
-        return delegated.removeIf(filter);
-    }
-
-    @Override
-    public Stream<ScriptResult> stream() {
-        return delegated.stream();
-    }
-
-    @Override
-    public Stream<ScriptResult> parallelStream() {
-        return delegated.parallelStream();
-    }
-
-    @Override
-    public void forEach(Consumer<? super ScriptResult> action) {
-        delegated.forEach(action);
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java b/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
deleted file mode 100644
index bf08e9862ac..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.logic.SequentFormula;
-import de.uka.ilkd.key.logic.Term;
-import de.uka.ilkd.key.rule.MatchConditions;
-import de.uka.ilkd.key.rule.inst.SVInstantiations;
-
-/**
- * Created by sarah on 5/2/17.
- */
-public final class SearchNode {
-    private final SequentFormula[] pattern;
-    private final int pos;
-    private final int succAntPos;
-    private final MatchConditions mc;
-
-
-    public SearchNode(SequentFormula[] pattern, int succAntPos) {
-        this.pattern = pattern;
-        this.pos = 0;
-        this.succAntPos = succAntPos;
-        this.mc = MatchConditions.EMPTY_MATCHCONDITIONS;
-    }
-
-    public SearchNode(SearchNode parent, MatchConditions cond) {
-        this.pattern = parent.pattern;
-        this.succAntPos = parent.succAntPos;
-        int parentPos = parent.pos;
-        this.pos = parentPos + 1;
-        mc = cond;
-    }
-
-    public boolean isAntecedent() {
-        return pos < succAntPos;
-    }
-
-    public Term getPatternTerm() {
-        return pattern[pos].formula();
-    }
-
-    public boolean isFinished() {
-        return pos >= pattern.length;
-    }
-
-    public SVInstantiations getInstantiations() {
-        return mc == null ? null : mc.getInstantiations();
-    }
-
-    public MatchConditions getMatchConditions() {
-        return mc;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java b/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
deleted file mode 100644
index 6f2fee63133..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Class to represent current Variable assigments. Created by S.Grebing
- */
-public class VariableAssignments {
-
-
-    public enum VarType {
-        INT("\\term int"), BOOL("\\term bool"), ANY("\\term any"), INT_ARRAY("\\term int[]"),
-        OBJECT("\\term Object"), HEAP("\\term Heap"), FIELD("\\term Field"),
-        LOCSET("\\term LocSet"), FORMULA("\\formula"), SEQ("\\term Seq");
-
-        private final String declPrefix;
-
-        VarType(String declPrefix) {
-            this.declPrefix = declPrefix;
-        }
-
-        public String getKeYDeclarationPrefix() {
-            return declPrefix;
-        }
-    }
-
-    /**
-     * Reference to parent assignments
-     */
-    private final VariableAssignments parent;
-
-    /**
-     * Current Assignments
-     */
-    private final Map<String, Object> currentAssignments;
-
-    /**
-     * Type Map of assignments
-     */
-    private final Map<String, VariableAssignments.VarType> typeMap;
-
-    /**
-     * Create new, empty variable assignment, to add variables
-     *
-     * @param parentAssignments the parent assignments
-     */
-    public VariableAssignments(VariableAssignments parentAssignments) {
-        this.currentAssignments = new HashMap<>();
-        this.typeMap = new HashMap<>();
-        this.parent = parentAssignments;
-    }
-
-
-    /**
-     * Default constructor
-     */
-    public VariableAssignments() {
-        this.currentAssignments = new HashMap<>();
-        this.typeMap = new HashMap<>();
-        this.parent = null;
-    }
-
-
-    /**
-     * Get the value of a stored variable name TODO Exception spezifischer
-     *
-     * @param varName
-     * @return Value of variable
-     */
-    public Object getVarValue(String varName) throws Exception {
-        if (currentAssignments.containsKey(varName)) {
-            return currentAssignments.get(varName);
-        } else {
-            if (parent != null) {
-                return parent.getVarValue(varName);
-            } else {
-                throw new Exception("Variable " + varName + " could not be found");
-            }
-        }
-    }
-
-    /**
-     * Add a variable assignment with type and value
-     *
-     * @param varName
-     * @param value
-     * @param type
-     */
-    public void addAssignmentWithType(String varName, Object value, VarType type) {
-        typeMap.put(varName, type);
-        currentAssignments.put(varName, value);
-
-    }
-
-    /**
-     * Add a variable assignment without type
-     *
-     * @param varName
-     * @param value
-     */
-    public void addAssignment(String varName, Object value) throws Exception {
-        if (typeMap.containsKey(varName)) {
-            currentAssignments.put(varName, value);
-        } else {
-            throw new Exception("Variable " + varName + "must be declared first");
-        }
-
-    }
-
-    /**
-     * TODO better exception Add a new type declaration
-     *
-     * @param varName
-     * @param type
-     */
-    public void addType(String varName, VarType type) throws Exception {
-        if (typeMap.containsKey(varName)) {
-            if (typeMap.get(varName) != type) {
-                throw new Exception("Variable " + varName + "was already declared with type "
-                    + typeMap.get(varName).toString());
-            }
-        } else {
-            typeMap.put(varName, type);
-        }
-    }
-
-    /**
-     * Returns the map of ID -> Type mappings
-     *
-     * @return
-     */
-    public Map<String, VariableAssignments.VarType> getTypeMap() {
-        return this.typeMap;
-    }
-
-
-    /*
-     * public Object getValue(String name) { return null; }
-     *
-     * public Type getType() { return null; }
-     *
-     * public void setType(Type type) {
-     *
-     * }
-     *
-     * public void setValue(String name) {
-     *
-     * }
-     */
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java b/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
deleted file mode 100644
index 402b65aa83c..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * This package gives an high-level entry point to the KeY world.
- *
- * @author Alexander Weigl
- * @author Sarah Grebing
- * @version 1 (21.04.17)
- * @see de.uka.ilkd.key.api.KeYApi
- */
-package de.uka.ilkd.key.api;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index 370527fb280..dc2936d64e7 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -3,13 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
-import java.io.File;
-import java.util.List;
-import java.util.Properties;
-import java.util.function.Consumer;
-
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.java.abstraction.KeYJavaType;
+import de.uka.ilkd.key.logic.op.IObserverFunction;
 import de.uka.ilkd.key.parser.Location;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.init.InitConfig;
@@ -20,7 +17,15 @@
 import de.uka.ilkd.key.proof.io.AbstractProblemLoader.ReplayResult;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.proof.mgt.SpecificationRepository;
+import de.uka.ilkd.key.rule.Rule;
+import de.uka.ilkd.key.speclang.Contract;
+import de.uka.ilkd.key.util.KeYTypeUtil;
 import de.uka.ilkd.key.util.Pair;
+import org.key_project.util.collection.ImmutableSet;
+
+import java.io.File;
+import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification
@@ -62,7 +67,7 @@ public class KeYEnvironment<U extends UserInterfaceControl> {
     /**
      * Constructor
      *
-     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig) {
@@ -72,11 +77,11 @@ public KeYEnvironment(U ui, InitConfig initConfig) {
     /**
      * Constructor
      *
-     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig, Proof loadedProof,
-            Pair<String, Location> proofScript, ReplayResult replayResult) {
+                          Pair<String, Location> proofScript, ReplayResult replayResult) {
         this.ui = ui;
         this.initConfig = initConfig;
         this.loadedProof = loadedProof;
@@ -175,15 +180,15 @@ public Proof createProof(ProofOblInput input) throws ProofInputException {
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
+     * @param location      The location to load.
+     * @param classPaths    The class path entries to use.
      * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param includes      Optional includes to consider.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-            List<File> classPaths, File bootClassPath, List<File> includes)
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes)
             throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, false);
     }
@@ -192,103 +197,103 @@ public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param location              The location to load.
+     * @param classPaths            The class path entries to use.
+     * @param bootClassPath         The boot class path to use.
+     * @param includes              Optional includes to consider.
      * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, null,
-            ruleCompletionHandler, false);
+                ruleCompletionHandler, false);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as
-     *        {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
-     *        will be used for new proofs.
+     *                                   {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
+     *                                   will be used for new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, null, null,
-            forceNewProfileOfNewProofs);
+                forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
-     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
+     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *        new proofs.
+     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *                                   new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, poPropertiesToForce,
-            ruleCompletionHandler,
-            null, forceNewProfileOfNewProofs);
+                ruleCompletionHandler,
+                null, forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
-     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
-     * @param callbackProofLoaded An optional callback (called when the proof is loaded, before
-     *        replay)
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
+     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
+     * @param callbackProofLoaded        An optional callback (called when the proof is loaded, before
+     *                                   replay)
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *        new proofs.
+     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *                                   new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-            Consumer<Proof> callbackProofLoaded,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+                                                                   Consumer<Proof> callbackProofLoaded,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         DefaultUserInterfaceControl ui = new DefaultUserInterfaceControl(ruleCompletionHandler);
         AbstractProblemLoader loader = ui.load(profile, location, classPaths, bootClassPath,
-            includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
+                includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
         InitConfig initConfig = loader.getInitConfig();
 
         return new KeYEnvironment<>(ui, initConfig, loader.getProof(),
-            loader.getProofScript(), loader.getResult());
+                loader.getProofScript(), loader.getResult());
     }
 
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File keyFile)
@@ -319,4 +324,41 @@ public boolean isDisposed() {
     public Pair<String, Location> getProofScript() {
         return proofScript;
     }
+
+    /**
+     * Retrieve a list of all available contracts for all known Java types.
+     *
+     * @return a non-null list, possible empty
+     */
+    public List<Contract> getAvailableContracts() {
+        List<Contract> proofContracts = new ArrayList<>(512);
+        Set<KeYJavaType> kjts = getJavaInfo().getAllKeYJavaTypes();
+        for (KeYJavaType type : kjts) {
+            if (!KeYTypeUtil.isLibraryClass(type)) {
+                ImmutableSet<IObserverFunction> targets = getSpecificationRepository().getContractTargets(type);
+                for (IObserverFunction target : targets) {
+                    ImmutableSet<Contract> contracts = getSpecificationRepository().getContracts(type, target);
+                    for (Contract contract : contracts) {
+                        proofContracts.add(contract);
+                    }
+                }
+            }
+        }
+        return proofContracts;
+    }
+
+
+    /**
+     * Constructs a list containing all known rules that are registered in the current
+     * environment.
+     *
+     * @return always returns a non-null list
+     */
+    public List<Rule> getRules() {
+        var rules = new ArrayList<Rule>(4096);
+        rules.addAll(getInitConfig().activatedTaclets());
+        getInitConfig().builtInRules().forEach(rules::add);
+        return rules;
+    }
+
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
similarity index 83%
rename from key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java
rename to key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
index fbdf19d343d..29b9579f640 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
@@ -1,25 +1,30 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
+package de.uka.ilkd.key.macros;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import de.uka.ilkd.key.macros.ProofMacro;
-
 /**
  * This class provides access to the proof script commands.
  *
  * @author Alexander Weigl
  * @version 1 (09.05.17)
  */
-public class ProofMacroApi {
+public class ProofMacroFacade {
+    private static ProofMacroFacade INSTANCE;
+
+    public static ProofMacroFacade instance() {
+        if (INSTANCE == null) INSTANCE = new ProofMacroFacade();
+        return INSTANCE;
+    }
+
     private final Map<String, ProofMacro> commandMap = new HashMap<>();
 
-    public ProofMacroApi() {
+    public ProofMacroFacade() {
         initialize();
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
similarity index 79%
rename from key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java
rename to key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
index bd23b64bc18..44a26161832 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
@@ -1,28 +1,34 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
+package de.uka.ilkd.key.macros.scripts;
+
+import de.uka.ilkd.key.smt.IllegalNumberException;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-
 /**
  * This class provides access to the proof script commands.
  *
  * @author Alexander Weigl
  * @version 1 (21.04.17)
  */
-public class ProofScriptCommandApi {
+public class ProofScriptCommandFacade {
+    private static ProofScriptCommandFacade INSTANCE;
     private final Map<String, ProofScriptCommand<?>> commandMap = new HashMap<>();
 
-    public ProofScriptCommandApi() {
+    public ProofScriptCommandFacade() {
         initialize();
     }
 
+    public static ProofScriptCommandFacade instance() {
+        if(INSTANCE == null) INSTANCE = new ProofScriptCommandFacade();
+        return INSTANCE;
+    }
+
     @SuppressWarnings("rawtypes")
     private void initialize() {
         ServiceLoader<ProofScriptCommand> loader = ServiceLoader.load(ProofScriptCommand.class);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
index b86a6a47719..6198a8b88d9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
@@ -3,10 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.proof;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 import de.uka.ilkd.key.java.Services;
@@ -16,6 +13,7 @@
 import de.uka.ilkd.key.logic.op.ProgramVariable;
 import de.uka.ilkd.key.pp.LogicPrinter;
 import de.uka.ilkd.key.pp.NotationInfo;
+import de.uka.ilkd.key.proof.mgt.RuleJustification;
 import de.uka.ilkd.key.proof.proofevent.NodeChangeJournal;
 import de.uka.ilkd.key.proof.proofevent.RuleAppInfo;
 import de.uka.ilkd.key.proof.rulefilter.TacletFilter;
@@ -26,6 +24,7 @@
 import de.uka.ilkd.key.strategy.AutomatedRuleApplicationManager;
 import de.uka.ilkd.key.strategy.QueueRuleApplicationManager;
 import de.uka.ilkd.key.strategy.Strategy;
+import de.uka.ilkd.key.util.MiscTools;
 import de.uka.ilkd.key.util.properties.MapProperties;
 import de.uka.ilkd.key.util.properties.Properties;
 import de.uka.ilkd.key.util.properties.Properties.Property;
@@ -716,6 +715,13 @@ public List<RuleApp> getAllBuiltInRuleApps() {
         return ruleApps;
     }
 
+    /**
+     * Return a list with available taclet application on this goal.
+     */
+    public List<TacletApp> getAllTacletApps() {
+        return getAllTacletApps(proof().getServices());
+    }
+
     public List<TacletApp> getAllTacletApps(Services services) {
         RuleAppIndex index = ruleAppIndex();
         index.autoModeStopped();
@@ -740,4 +746,37 @@ protected boolean filter(Taclet taclet) {
         return allApps;
     }
 
+    /**
+     * Returns a list with all known rule applications within this proof goal.
+     */
+    public List<RuleApp> getAllAvailableRules() {
+        var taclets = getAllTacletApps();
+        var builtin = getAllBuiltInRuleApps();
+        builtin.addAll(taclets);
+        return builtin;
+    }
+
+    public List<Rule> getAvailableRules() {
+        var s = new ArrayList<Rule>(2048);
+        for (final BuiltInRule br : ruleAppIndex().builtInRuleAppIndex()
+                .builtInRuleIndex().rules()) {
+            s.add(br);
+        }
+
+        Set<NoPosTacletApp> set = ruleAppIndex().tacletIndex().allNoPosTacletApps();
+        OneStepSimplifier simplifier = MiscTools.findOneStepSimplifier(proof());
+        if (simplifier != null && !simplifier.isShutdown()) {
+            set.addAll(simplifier.getCapturedTaclets());
+        }
+
+        for (final NoPosTacletApp app : set) {
+            RuleJustification just = proof().mgt().getJustification(app);
+            if (just == null) {
+                continue; // do not break system because of this
+            }
+            s.add(app.taclet()); //TODO not good
+        }
+        return s;
+    }
+
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
index 6b97d88d82d..d7ac6c484d0 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
@@ -11,6 +11,7 @@
 import java.util.function.Predicate;
 import javax.swing.*;
 
+import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.*;
@@ -27,6 +28,7 @@
 import de.uka.ilkd.key.proof.replay.CopyingProofReplayer;
 import de.uka.ilkd.key.rule.NoPosTacletApp;
 import de.uka.ilkd.key.rule.OneStepSimplifier;
+import de.uka.ilkd.key.rule.Rule;
 import de.uka.ilkd.key.rule.merge.MergePartner;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp;
@@ -54,7 +56,7 @@
  * information, and methods to apply rules. Furthermore, it offers services that deliver the open
  * goals, namespaces and several other information about the current state of the proof.
  */
-public class Proof implements Named {
+public class Proof implements Named, Identifiable {
 
     /**
      * The time when the {@link Proof} instance was created.
@@ -1475,4 +1477,12 @@ public void copyCachedGoals(Proof referencedFrom, Consumer<Integer> callbackTota
             }
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String identification() {
+        return getClass().getName() + "_" + name + "_" + hashCode();
+    }
 }
diff --git a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
index 3561874cf37..21f2fbc3674 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
@@ -3,47 +3,32 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.speclang.njml;
 
-import java.io.File;
-
-import de.uka.ilkd.key.api.KeYApi;
-import de.uka.ilkd.key.api.ProofManagementApi;
-import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.init.ProofInputException;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.util.HelperClassForTests;
-
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.util.stream.Stream;
 
 public class ContractLoadingTests {
     public static final File EXAMPLES_DIR = new File("../key.ui/examples/");
 
-    @Test
-    public void sumAndMax() throws ProblemLoaderException {
-        final File javaFile =
-            new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java");
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Services services = file.getServices();
-        Logger LOGGER = LoggerFactory.getLogger(ContractLoadingTests.class);
-        for (Contract proofContract : file.getProofContracts()) {
-            LOGGER.info(proofContract.getPlainText(services));
-        }
+    static Stream<Arguments> files() {
+        return Stream.of(
+                new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java")
+        ).map(Arguments::of);
     }
 
-    @Test
-    public void issues1658() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-    }
-
-    @Test
+    @ParameterizedTest
+    @MethodSource("files")
     void issues1717() throws ProblemLoaderException, ProofInputException {
         File javaFile =
             new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1717/UnderscoreZero.java");
@@ -55,20 +40,8 @@ void issues1717() throws ProblemLoaderException, ProofInputException {
     }
 
     @Test
-    public void specMathJavaMathTest() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-    }
-
-    @Test
-    public void specMathBigintMathTest() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
+    public void nonEmptyContract(File javaFile) throws ProblemLoaderException {
+        KeYEnvironment<?> env = KeYEnvironment.load(javaFile);
+        Assertions.assertFalse(env.getAvailableContracts().isEmpty());
     }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
index e37603b344e..16420583f3a 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
@@ -301,7 +301,7 @@ public static List<Example> listExamples(File examplesDir) {
             new BufferedReader(new FileReader(index, StandardCharsets.UTF_8))) {
             while ((line = br.readLine()) != null) {
                 line = line.trim();
-                if (line.startsWith("#") || line.length() == 0) {
+                if (line.startsWith("#") || line.isEmpty()) {
                     continue;
                 }
                 File f = new File(examplesDir, line);
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
new file mode 100644
index 00000000000..f7aadd6467c
--- /dev/null
+++ b/keyext.api.doc/build.gradle
@@ -0,0 +1,4 @@
+dependencies {
+    implementation("com.github.javaparser:javaparser-core:3.25.5")
+    implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.5")
+}
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
new file mode 100644
index 00000000000..a9df59adef8
--- /dev/null
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -0,0 +1,162 @@
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.expr.MemberValuePair;
+import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
+import com.github.javaparser.javadoc.JavadocBlockTag;
+import com.github.javaparser.resolution.SymbolResolver;
+import com.github.javaparser.resolution.TypeSolver;
+import com.github.javaparser.symbolsolver.JavaSymbolSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.TypeSolverBuilder;
+import com.github.javaparser.utils.SourceRoot;
+
+import javax.annotation.Nonnull;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public class ExtractMetaData {
+    private static PrintWriter out;
+
+    public static void main(String[] args) throws IOException {
+        System.out.println("XXX" + Arrays.toString(args));
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
+        /*config.setAttributeComments(true);
+        config.setLexicalPreservationEnabled(false);
+        config.setStoreTokens(false);
+        config.setIgnoreAnnotationsWhenAttributingComments(true);
+        config.setDoNotAssignCommentsPrecedingEmptyLines(true);*/
+        //var root = Paths.get(args[0]);
+        TypeSolver typeSolver = new TypeSolverBuilder()
+                .withSourceCode("keyext.api/src/main/java")
+                .withSourceCode("key.core/src/main/java")
+                .withSourceCode("key.util/src/main/java")
+                .withCurrentJRE()
+                .build();
+        SymbolResolver symbolResolver = new JavaSymbolSolver(typeSolver);
+        config.setSymbolResolver(symbolResolver);
+        var source = new SourceRoot(Paths.get("keyext.api", "src", "main", "java"), config);
+        var cu = source.tryToParse();
+        var jsonSegment = Comparator.comparing(ExtractMetaData::getJsonSegment);
+        var segments = cu.stream().filter(ParseResult::isSuccessful)
+                .filter(it -> it.getResult().get().getPrimaryType().isPresent())
+                .map(it -> it.getResult().get().getPrimaryType().get())
+                .filter(ExtractMetaData::hasJsonSegment)
+                .sorted(jsonSegment)
+                .toList();
+
+        try (var out = new PrintWriter(new FileWriter("doc.md"))) {
+            ExtractMetaData.out = out;
+            printHeader(segments);
+            segments.forEach(ExtractMetaData::printDocumentation);
+            printFooter(segments);
+        }
+
+        // "org.keyproject.key.api.remoteapi.KeyApi";
+    }
+
+    private static void printDocumentation(TypeDeclaration<?> typeDeclaration) {
+        out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        out.println(getJavaDoc(typeDeclaration));
+        out.println("\n");
+
+        for (MethodDeclaration method : typeDeclaration.getMethods()) {
+            if (!isExported(method)) continue;
+
+            String callName = getCallName(method, typeDeclaration);
+
+            out.format("### %s (type: %s) %n%n", callName, type(method));
+
+            out.println(getJavaDoc(method));
+
+            out.println();
+        }
+    }
+
+    private static String getCallName(MethodDeclaration m, TypeDeclaration<?> td) {
+        var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+                        () -> m.getAnnotationByName("JsonRequest"))
+                .orElseThrow();
+
+        var segment = getJsonSegment(td) + "/";
+        String name = "";
+
+        if (annotationExpr.isMarkerAnnotationExpr()) {
+            name = m.getNameAsString();
+        } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+            var sma = annotationExpr.asSingleMemberAnnotationExpr();
+            name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+        } else {
+            var ne = annotationExpr.asNormalAnnotationExpr();
+            for (MemberValuePair pair : ne.getPairs()) {
+                switch (pair.getName().asString()) {
+                    case "value":
+                        name = pair.getValue().asLiteralStringValueExpr().getValue();
+                        break;
+                    case "useSegment":
+                        if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+                            segment = "";
+                        }
+                }
+            }
+        }
+        return segment + name;
+    }
+
+
+    @Nonnull
+    private static String getJavaDoc(NodeWithJavadoc<?> typeDeclaration) {
+        if (typeDeclaration.getJavadoc().isPresent()) {
+            final var javadoc = typeDeclaration.getJavadoc().get();
+            return javadoc.getDescription().toText()
+                    + "\n\n"
+                    + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+                    .collect(Collectors.joining("\n"));
+        }
+        return "";
+    }
+
+    private static String type(MethodDeclaration method) {
+        if (method.getAnnotationByName("JsonNotification").isPresent())
+            return "notification";
+        if (method.getAnnotationByName("JsonRequest").isPresent())
+            return "request";
+        return "";
+    }
+
+    private static boolean isExported(MethodDeclaration method) {
+        return method.getAnnotationByName("JsonNotification").isPresent()
+                || method.getAnnotationByName("JsonRequest").isPresent();
+    }
+
+    private static void printHeader(List<? extends TypeDeclaration<?>> segments) {
+        out.format("# KeY-API%n%n");
+    }
+
+    private static void printFooter(List<? extends TypeDeclaration<?>> segments) {
+
+
+    }
+
+
+    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+        return it.getAnnotationByName("JsonSegment").isPresent();
+    }
+
+    private static String getJsonSegment(TypeDeclaration<?> it) {
+        var ae = it.getAnnotationByName("JsonSegment").get();
+        return ae.asSingleMemberAnnotationExpr().getMemberValue()
+                .asLiteralStringValueExpr().getValue();
+    }
+}
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 0f3b2743c24..c2b84249430 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -18,6 +18,9 @@ dependencies {
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
     implementation("info.picocli:picocli:4.7.5")
+
+    implementation("com.google.guava:guava:32.1.3-jre")
+
     //for GraalVM annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
 }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
deleted file mode 100644
index 9c03fdfae41..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.keyproject.key.api;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FileTypeAdapter extends TypeAdapter<File> {
-    @Override
-    public void write(JsonWriter out, File value) throws IOException {
-        out.value(value.toString());
-    }
-
-    @Override
-    public File read(JsonReader in) throws IOException {
-        return new File(in.nextString());
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
new file mode 100644
index 00000000000..248210a9f7f
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -0,0 +1,168 @@
+package org.keyproject.key.api;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommandFacade;
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.Statistics;
+import de.uka.ilkd.key.util.KeYConstants;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.adapters.KeyAdapter;
+import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.remoteapi.KeyApi;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public record KeyApiImpl(KeyAdapter adapter) implements KeyApi {
+
+    @Override
+    @JsonRequest
+    public CompletableFuture<List<Example>> examples() {
+        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    }
+
+    @Override
+    public CompletableFuture<Void> shutdown() {
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public void exit() {
+    }
+
+    @Override
+    public void setTrace(SetTraceParams params) {
+
+    }
+
+    @Override
+    public CompletableFuture<String> getVersion() {
+        return CompletableFuture.completedFuture(KeYConstants.VERSION);
+    }
+
+    @Override
+    public CompletableFuture<List<ProofMacro>> getAvailableMacros() {
+        return CompletableFuture.completedFuture(
+                ProofMacroFacade.instance().getMacros().stream().toList()
+        );
+    }
+
+    @Override
+    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+        return CompletableFuture.completedFuture(
+                ProofScriptCommandFacade.instance().getScriptCommands().stream().toList());
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> macro(Proof id, String macroId, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> auto(Proof id, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> dispose(Proof id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> goals(Proof id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> tree(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> root(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Statistics> statistics(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<TreeNodeDesc> treeRoot(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<Function>> functions(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<GoalText> print(Node id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TermAction>> actions(PrintId id, int pos) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TermAction>> applyAction(TermActionId id) {
+        return null;
+    }
+
+    @Override
+    public void freePrint(PrintId id) {
+
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 26837bb84b6..408cc36acdd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -4,7 +4,7 @@
 import com.google.gson.GsonBuilder;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
-import org.keyproject.key.api.remoteapi.KeyApiImpl;
+import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteclient.ClientApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,9 +16,6 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -29,6 +26,8 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
+    private static KeyAdapter adapter;
+
     //region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
@@ -55,7 +54,7 @@ public class StartServer implements Runnable {
     boolean helpRequested = false;
 
     @Option(names = "--websocket")
-    boolean websocket;
+    boolean websocket = false;
     //endregion
 
     public static void main(String[] args) {
@@ -115,27 +114,6 @@ public void run() {
             return;
         }
 
-        /*
-        var server = new Server();
-        var connector = new ServerConnector();
-        server.addConnector(connector);
-        // Setup the basic application "context" for this application at "/"
-        // This is also known as the handler tree (in jetty speak)
-        var context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        context.setContextPath("/");
-        server.setHandler(context);
-
-        // Initialize javax.websocket layer
-        JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
-        {
-            // Configure defaults for container
-            wsContainer.setDefaultMaxTextMessageBufferSize(65535);
-
-            // Add WebSocket endpoint to javax.websocket layer
-            wsContainer.addEndpoint(WebSocketEndpoint.class);
-        });*/
-
-
         try {
             if (websocket) {
                 var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
@@ -144,7 +122,7 @@ public void run() {
                         .traceMessages(new PrintWriter(System.err))
                         .validateMessages(true);
                 launcherBuilder.configureGson(StartServer::configureJson);
-                launcherBuilder.setLocalService(new KeyApiImpl());
+                launcherBuilder.setLocalService(new KeyApiImpl(adapter));
                 launcherBuilder.setRemoteInterface(ClientApi.class);
                 launcherBuilder.create().startListening().get();
             } else {
@@ -160,8 +138,9 @@ public void run() {
         }
     }
 
+
     public static void configureJson(GsonBuilder gsonBuilder) {
-        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+        adapter = new KeyAdapter(gsonBuilder);
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
@@ -174,30 +153,11 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
-
         //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl());
+        launcherBuilder.setLocalService(new KeyApiImpl(adapter));
         //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
         return launcherBuilder.create();
     }
-
-
-    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
-        return Collections.singleton(ClientApi.class);
-      /*  return ServiceLoader.load(ClientService.class)
-                .stream()
-                .map(ServiceLoader.Provider::type)
-                .collect(Collectors.toSet());
-       */
-    }
-
-    private static List<Object> getLocalServices() {
-        return Collections.singletonList(new KeyApiImpl());
-        /*return ServiceLoader.load(KeyService.class)
-                .stream().map(ServiceLoader.Provider::get)
-                .map(it -> (Object) it)
-                .toList();*/
-    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
new file mode 100644
index 00000000000..9168a2128f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -0,0 +1,96 @@
+package org.keyproject.key.api.adapters;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.gson.*;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import de.uka.ilkd.key.Identifiable;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.proof.Proof;
+import org.keyproject.key.api.data.MacroDescription;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Type;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public class KeyAdapter {
+    private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    //private final TypeAdapter<Object> adaptor;
+
+    public KeyAdapter(GsonBuilder gson) {
+        gson.registerTypeAdapter(File.class, new FileTypeAdapter());
+        gson.registerTypeAdapter(Function.class, new FunctionTypeAdapter());
+        gson.registerTypeAdapter(Proof.class, new IdentifiableTypeAdapter());
+        gson.registerTypeAdapter(ProofMacro.class, new MacroTypeAdapter());
+        //adaptor = gson.create().getAdapter(Object.class);
+    }
+
+
+    //translating entities to identification strings
+    public String insert(Identifiable p) {
+        var id = p.identification();
+        if (!map.containsKey(id)) {
+            map.put(id, new WeakReference<>(p));
+        }
+        return id;
+    }
+
+    public Object find(String id) {
+        return map.get(id).get();
+    }
+    //endregion
+
+    class MacroTypeAdapter implements JsonSerializer<ProofMacro> {
+        @Override
+        public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
+            return context.serialize(MacroDescription.from(src));
+        }
+    }
+
+    class FileTypeAdapter extends TypeAdapter<File> {
+        @Override
+        public void write(JsonWriter out, File value) throws IOException {
+            out.value(value.toString());
+        }
+
+        @Override
+        public File read(JsonReader in) throws IOException {
+            return new File(in.nextString());
+        }
+    }
+
+    class FunctionTypeAdapter implements JsonSerializer<Function> {
+        @Override
+        public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
+            var obj = new JsonObject();
+            obj.add("name", context.serialize(src.name().toString()));
+            obj.add("skolemConstant", context.serialize(src.isSkolemConstant()));
+            obj.add("isRigid", context.serialize(src.isRigid()));
+            obj.add("isUnique", context.serialize(src.isUnique()));
+            obj.add("sort", context.serialize(src.sort()));
+            obj.add("argSorts", context.serialize(src.argSorts()));
+            return obj;
+        }
+    }
+
+    class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
+        @Override
+        public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return (Identifiable) find(json.getAsString());
+        }
+
+        @Override
+        public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext context) {
+            insert(src);
+            return context.serialize(src.identification());
+        }
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
new file mode 100644
index 00000000000..bbc28eec1ec
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Adapter classes for translating things from Java to JSON via GSON api.
+ *
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+package org.keyproject.key.api.adapters;
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
new file mode 100644
index 00000000000..a81f8d863db
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record ContractDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
new file mode 100644
index 00000000000..0c612b44cc2
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.data;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record FunctionDesc(String name, String sort, List<String> sorts) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
new file mode 100644
index 00000000000..7a0e2f264e0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.pp.PositionTable;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record GoalText(PrintId id, String text, PositionTable table) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
new file mode 100644
index 00000000000..85ec900cd57
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.data;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ *
+ * @param keyFile
+ * @param javaFile
+ * @param classPath
+ * @param bootClassPath
+ * @param includes
+ */
+public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
similarity index 72%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index ad6d12babf8..0274bc38b30 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -1,7 +1,13 @@
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
 
+/**
+ *
+ * @param name
+ * @param description
+ * @param category
+ */
 public record MacroDescription(String name, String description, String category) {
     public static MacroDescription from(ProofMacro m) {
         return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
new file mode 100644
index 00000000000..74c2d9d1cc4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record MacroStatistic() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
new file mode 100644
index 00000000000..9bc8ad0cd04
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record NodeDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
new file mode 100644
index 00000000000..640c25371d6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record PredicateDesc(String name, String[] argSorts) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
new file mode 100644
index 00000000000..3d4893d43e4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record PrintId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
new file mode 100644
index 00000000000..4e2de0d4010
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -0,0 +1,18 @@
+package org.keyproject.key.api.data;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record ProblemDefinition(
+        @Nullable List<SortDesc> sorts,
+        @Nullable List<FunctionDesc> functions,
+        @Nullable List<PredicateDesc> predicates,
+        @Nullable List<String> antecTerms,
+        @Nullable List<String> succTerms
+) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
new file mode 100644
index 00000000000..14d737fd5d6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
@@ -0,0 +1,42 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Functionalities for loading proofs either from a built-in example, or from a set of files.
+ *
+ * @author Alexander Weigl
+ * @since v1
+ */
+@JsonSegment("loading")
+public interface ProofLoading {
+    /**
+     * I am not sure whether this is helpful. Mainly a feature for testing?!
+     * @param id
+     * @return
+     */
+    @JsonRequest
+    CompletableFuture<Proof> loadExample(String id);
+
+    /**
+     *
+     */
+    @JsonRequest
+    CompletableFuture<Proof> loadProblem(ProblemDefinition problem);
+
+    /**
+     * Test!
+     *
+     * @param params parameters for loading
+     * @return
+     * @throws ProblemLoaderException if something went wrong
+     */
+    @JsonRequest
+    CompletableFuture<KeYEnvironment<?>> load(LoadParams params) throws ProblemLoaderException;
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
new file mode 100644
index 00000000000..b582b4a73f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record SortDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
new file mode 100644
index 00000000000..b73ee35b7b5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record StreategyOptions() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
new file mode 100644
index 00000000000..b69046120f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermAction(TermActionId commandId, String displayName) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
new file mode 100644
index 00000000000..7951c776af4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermActionId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
similarity index 54%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index 567b740d6d8..7f8c9564aa9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 public enum TraceValue {
     Off, Message, All;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
new file mode 100644
index 00000000000..213bb6b9dbe
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public class TreeNodeDesc {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
new file mode 100644
index 00000000000..3dba5cc492e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TreeNodeId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
new file mode 100644
index 00000000000..e82ca44ae28
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -0,0 +1,31 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.ContractDesc;
+import org.keyproject.key.api.data.SortDesc;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("env")
+public interface EnvApi {
+    @JsonRequest
+    CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<List<Function>> functions(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
deleted file mode 100644
index 3a2b5291d66..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-/**
- * @author Alexander Weigl
- * @version 1 (06.10.23)
- */
-public record EnvId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
similarity index 91%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index b1bc064b954..9ccbb03049f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -8,7 +8,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment("examples")
-public interface KeyExampleApi {
+public interface ExampleApi {
     @JsonRequest("list")
     CompletableFuture<List<Example>> examples();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
new file mode 100644
index 00000000000..fe678b8f04e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -0,0 +1,32 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Node;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.GoalText;
+import org.keyproject.key.api.data.PrintId;
+import org.keyproject.key.api.data.TermAction;
+import org.keyproject.key.api.data.TermActionId;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("goal")
+public interface GoalApi {
+    @JsonRequest
+    CompletableFuture<GoalText> print(Node id);
+
+    @JsonRequest
+    CompletableFuture<List<TermAction>> actions(PrintId id, int pos);
+
+    @JsonRequest("apply_action")
+    CompletableFuture<List<TermAction>> applyAction(TermActionId id);
+
+    @JsonNotification("free")
+    void freePrint(PrintId id);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 9a6e35fe2eb..ac650359a74 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,55 +1,7 @@
 package org.keyproject.key.api.remoteapi;
 
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface KeyApi extends KeyExampleApi, KeyMetaApi {
-    //region general server management
-    /**
-     * Shutdown Request (:leftwards_arrow_with_hook:)
-     The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
-
-     If a server receives requests after a shutdown request those requests should error with InvalidRequest.
-
-     Request:
-
-     method: ‘shutdown’
-     params: none
-     Response:
-
-     result: null
-     error: code and message set in case an exception happens during shutdown request.
-     */
-    @JsonRequest
-    CompletableFuture<Void> shutdown();
-
-    /**
-     * Exit Notification (:arrow_right:)
-     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘exit’
-     * params: none
-     */
-    @JsonNotification
-    void exit();
-
-
-
-    interface SetTraceParams {
-        /**
-         * The new value that should be assigned to the trace setting.
-         */
-        TraceValue value = null;
-    }
-    /**
-     * SetTrace Notification
-     * A notification that should be used by the client to modify the trace setting of the server.
-     */
-    @JsonNotification
-    void setTrace(SetTraceParams params);
-    //endregion
+/**
+ * The combined interface that is provided by KeY.
+ */
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
deleted file mode 100644
index 33ae9c03aba..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import de.uka.ilkd.key.api.KeYApi;
-import de.uka.ilkd.key.gui.Example;
-import de.uka.ilkd.key.gui.ExampleChooser;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.util.KeYConstants;
-import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-@JsonSegment
-public class KeyApiImpl implements KeyApi {
-    @Override
-    @JsonRequest
-    public CompletableFuture<List<Example>> examples() {
-        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
-    }
-
-    @Override
-    public CompletableFuture<Void> shutdown() {
-        return CompletableFuture.completedFuture(null);
-    }
-
-    @Override
-    public void exit() {
-
-    }
-
-    @Override
-    public void setTrace(SetTraceParams params) {
-
-    }
-
-    @Override
-    public CompletableFuture<String> getVersion() {
-        return CompletableFuture.completedFuture(KeYConstants.VERSION);
-    }
-
-    @Override
-    public CompletableFuture<List<MacroDescription>> getAvailableMacros() {
-        return CompletableFuture.completedFuture(
-                KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
-                        .toList()
-        );
-    }
-
-    @Override
-    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
-        return CompletableFuture.completedFuture(
-                KeYApi.getScriptCommandApi().getScriptCommands().stream().toList());
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
deleted file mode 100644
index 7eadda846ba..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import java.io.File;
-import java.util.List;
-
-public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {
-
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
similarity index 64%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index df0112c51f2..a4a16b66b02 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,5 +1,6 @@
 package org.keyproject.key.api.remoteapi;
 
+import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
@@ -8,13 +9,13 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment("meta")
-public interface KeyMetaApi {
-    @JsonRequest
+public interface MetaApi {
+    @JsonRequest("version")
     CompletableFuture<String> getVersion();
 
-    @JsonRequest
-    CompletableFuture<List<MacroDescription>> getAvailableMacros();
+    @JsonRequest("available_macros")
+    CompletableFuture<List<ProofMacro>> getAvailableMacros();
 
-    @JsonRequest
+    @JsonRequest("available_script_commands")
     CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
new file mode 100644
index 00000000000..16c9f390b89
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -0,0 +1,48 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.Statistics;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.data.MacroStatistic;
+import org.keyproject.key.api.data.NodeDesc;
+import org.keyproject.key.api.data.StreategyOptions;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public interface ProofApi {
+    @JsonRequest
+    CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<MacroStatistic> macro(Proof proof, String macroId, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<MacroStatistic> auto(Proof proof, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<Boolean> dispose(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> goals(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> tree(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> root(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId);
+
+    @JsonRequest
+    CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId);
+
+    @JsonRequest
+    CompletableFuture<Statistics> statistics(Proof proof);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
deleted file mode 100644
index 7d1d4eb5d6b..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-public record ProofId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
deleted file mode 100644
index 49081037dc0..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-@JsonSegment
-public interface ProofLoading {
-    @JsonRequest
-    ProofId loadExample(String id);
-
-    /**
-     * @param params
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest
-    EnvId load(LoadParams params) throws ProblemLoaderException;
-}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
new file mode 100644
index 00000000000..88f5cad0330
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -0,0 +1,26 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.TreeNodeDesc;
+import org.keyproject.key.api.data.TreeNodeId;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("proofTree")
+public interface ProofTreeApi {
+    @JsonRequest("root")
+    CompletableFuture<TreeNodeDesc> treeRoot(Proof id);
+
+    @JsonRequest("children")
+    CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId);
+
+    @JsonRequest("subtree")
+    CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
new file mode 100644
index 00000000000..ddd1fe408e6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -0,0 +1,60 @@
+package org.keyproject.key.api.remoteapi;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.TraceValue;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("server")
+public interface ServerManagement {
+    /**
+     * Shutdown Request (:leftwards_arrow_with_hook:)
+     * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+     * <p>
+     * If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+     * <p>
+     * Request:
+     * <p>
+     * method: ‘shutdown’
+     * params: none
+     * Response:
+     * <p>
+     * result: null
+     * error: code and message set in case an exception happens during shutdown request.
+     */
+    @JsonRequest
+    CompletableFuture<Void> shutdown();
+
+    /**
+     * Exit Notification (:arrow_right:)
+     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘exit’
+     * params: none
+     */
+    @JsonNotification
+    void exit();
+
+
+    interface SetTraceParams {
+        /**
+         * The new value that should be assigned to the trace setting.
+         */
+        TraceValue value = null;
+    }
+
+    /**
+     * SetTrace Notification
+     * A notification that should be used by the client to modify the trace setting of the server.
+     */
+    @JsonNotification
+    void setTrace(SetTraceParams params);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index 6f02b10a186..a7aebdca1bf 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -7,7 +7,7 @@
 import javax.annotation.Nullable;
 import java.util.concurrent.CompletableFuture;
 
-@JsonSegment
+@JsonSegment("client")
 public interface ClientApi {
     @JsonNotification
     void sayHello(String e);
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 3370f6eb31f..1b63674ce67 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -18,7 +18,7 @@ public void logTrace(LogTraceParams params) {
     }
 
     @Override
-    public void userResponse(ShowMessageParams params) {
+    public void showMessage(ShowMessageParams params) {
 
     }
 
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/Client.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
similarity index 57%
rename from keyext.api/src/test/java/org/keyproject/key/api/Client.java
rename to keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index 4922de0993a..edbe4aee393 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/Client.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -2,6 +2,9 @@
 
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -11,13 +14,17 @@
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class Client {
-    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException, TimeoutException {
+public class TestRpc {
+    private Future<Void> clientListening, serverListening;
+    private KeyApi keyApi;
+
+    @BeforeEach
+    void setup() throws IOException, ExecutionException, InterruptedException, TimeoutException {
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
         PipedInputStream inServer = new PipedInputStream();
@@ -41,13 +48,33 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         Logger logger = Logger.getLogger(StreamMessageProducer.class.getName());
         logger.setLevel(Level.SEVERE);
 
-        var clientListening = clientLauncher.startListening();
-        var serverListening = serverLauncher.startListening();
+        clientListening = clientLauncher.startListening();
+        serverListening = serverLauncher.startListening();
+
+        keyApi = clientLauncher.getRemoteProxy();
+    }
+
+    @AfterEach
+    void teardown() throws ExecutionException, InterruptedException, TimeoutException {
+        serverListening.cancel(true);
+        clientListening.cancel(true);
+    }
+
+
+    @Test
+    public void hello() {
 
-        //clientLauncher.getRemoteProxy().examples();
-        serverLauncher.getRemoteProxy().sayHello("Alex");
+    }
+
+    @Test
+    public void listMacros() throws ExecutionException, InterruptedException {
+        var examples = keyApi.getAvailableMacros().get();
+        System.out.println(examples);
+    }
 
-        serverListening.get(1, TimeUnit.SECONDS);
-        clientListening.get(1, TimeUnit.SECONDS);
+    @Test
+    public void listExamples() throws ExecutionException, InterruptedException {
+        var examples = keyApi.examples().get();
+        System.out.println(examples);
     }
 }
diff --git a/settings.gradle b/settings.gradle
index a7fccaa51b6..f2d7206d797 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,3 +15,4 @@ include 'keyext.exploration'
 include 'keyext.slicing'
 
 include 'keyext.api'
+include 'keyext.api.doc'

From a049fa55e232917758409ea25d612a2f6c49f769 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 29 Oct 2023 16:45:43 +0100
Subject: [PATCH 05/50] working on a working minimal version

---
 .../src/main/java/org/key_project/Main.java   |    3 +-
 .../AbstractSymbolicExecutionTestCase.java    | 1636 +++++++++--------
 .../java/de/uka/ilkd/key/Identifiable.java    |   11 -
 .../key/control/AbstractProofControl.java     |   13 +-
 .../ilkd/key/control/DefaultProofControl.java |   51 +-
 .../de/uka/ilkd/key/control/ProofControl.java |   10 +-
 .../key/macros/ProofMacroFinishedInfo.java    |    1 +
 .../ilkd/key/macros/ProofMacroListener.java   |    2 +-
 .../main/java/de/uka/ilkd/key/proof/Node.java |   79 +-
 .../java/de/uka/ilkd/key/proof/Proof.java     |   12 +-
 .../ilkd/key/proof/io/TestZipProofSaving.java |    2 +-
 .../de/uka/ilkd/key/gui/ProofMacroWorker.java |   39 +-
 .../uka/ilkd/key/gui/ProofScriptWorker.java   |    7 +
 .../key/gui/actions/RunAllProofsAction.java   |   25 +-
 .../key/ui/ConsoleUserInterfaceControl.java   |    8 +-
 .../uka/ilkd/key/ui/MediatorProofControl.java |   22 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  487 ++++-
 .../org/keyproject/key/api/NodeTextDesc.java  |    8 +
 .../org/keyproject/key/api/NodeTextId.java    |   10 +
 .../org/keyproject/key/api/StartServer.java   |   16 +-
 .../keyproject/key/api/TermActionUtil.java    |  125 ++
 .../key/api/adapters/KeyAdapter.java          |   29 +-
 .../keyproject/key/api/data/ContractDesc.java |   11 +-
 .../keyproject/key/api/data/FunctionDesc.java |   13 +-
 .../org/keyproject/key/api/data/GoalText.java |   10 -
 .../key/api/data/KeyIdentifications.java      |  163 ++
 .../key/api/data/MacroStatistic.java          |    9 +-
 .../org/keyproject/key/api/data/NodeDesc.java |   12 +-
 .../org/keyproject/key/api/data/PrintId.java  |    8 -
 .../key/api/data/ProofMacroDesc.java          |   14 +
 .../key/api/data/ProofScriptCommandDesc.java  |   13 +
 .../org/keyproject/key/api/data/SortDesc.java |   13 +-
 .../keyproject/key/api/data/TermAction.java   |    8 -
 .../key/api/data/TermActionDesc.java          |   11 +
 .../keyproject/key/api/data/TermActionId.java |    6 -
 .../key/api/data/TermActionKind.java          |    9 +
 .../keyproject/key/api/data/TreeNodeId.java   |    6 -
 .../keyproject/key/api/internal/NodeText.java |   12 +
 .../keyproject/key/api/remoteapi/EnvApi.java  |   13 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |   17 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |    2 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |    9 +-
 .../key/api/remoteapi/PrintOptions.java       |    9 +
 .../key/api/remoteapi/ProofApi.java           |   23 +-
 .../ProofLoadApi.java}                        |   25 +-
 .../key/api/remoteapi/ProofTreeApi.java       |   10 +-
 .../key/api/remoteclient/ClientApi.java       |    7 +
 .../org/keyproject/key/api/SimpleClient.java  |   17 +
 .../java/org/keyproject/key/api/TestRpc.java  |    7 +-
 .../ProofExplorationServiceTest.java          |   47 +-
 50 files changed, 2000 insertions(+), 1100 deletions(-)
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{data/ProofLoading.java => remoteapi/ProofLoadApi.java} (50%)

diff --git a/key.core.example/src/main/java/org/key_project/Main.java b/key.core.example/src/main/java/org/key_project/Main.java
index 51ba6c5547d..4da18d230e9 100644
--- a/key.core.example/src/main/java/org/key_project/Main.java
+++ b/key.core.example/src/main/java/org/key_project/Main.java
@@ -92,6 +92,7 @@ private static void proveEnvironmemt(KeYEnvironment<?> env) {
             for (Contract contract : proofContracts) {
                 proveContract(env, contract);
             }
+        } catch (InterruptedException ignored) {
         } finally {
             env.dispose(); // Ensure always that all instances of KeYEnvironment are disposed
         }
@@ -130,7 +131,7 @@ private static List<Contract> getContracts(KeYEnvironment<?> env) {
      * @param env the {@link KeYEnvironment} in which to prove the contract
      * @param contract the {@link Contract} to be proven
      */
-    private static void proveContract(KeYEnvironment<?> env, Contract contract) {
+    private static void proveContract(KeYEnvironment<?> env, Contract contract) throws InterruptedException {
         Proof proof = null;
         try {
             // Create proof
diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
index 95c6da8fe33..907a15d5c9d 100644
--- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
+++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
@@ -44,7 +44,6 @@
 import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
 import de.uka.ilkd.key.util.HelperClassForTests;
 import de.uka.ilkd.key.util.KeYConstants;
-
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableArray;
 import org.key_project.util.collection.ImmutableList;
@@ -52,11 +51,15 @@
 import org.key_project.util.helper.FindResources;
 import org.key_project.util.java.CollectionUtil;
 import org.key_project.util.java.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -66,7 +69,7 @@
  */
 public abstract class AbstractSymbolicExecutionTestCase {
     private static final Logger LOGGER =
-        LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
+            LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
 
     /**
      * <p>
@@ -83,7 +86,7 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * </p>
      */
     public static final boolean CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY =
-        Boolean.getBoolean("UPDATE_TEST_ORACLE");
+            Boolean.getBoolean("UPDATE_TEST_ORACLE");
 
 
     static {
@@ -99,13 +102,13 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * Number of executed SET nodes to execute all in one.
      */
     public static final int ALL_IN_ONE_RUN =
-        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
 
     /**
      * Number of executed SET nodes for only one SET node per auto mode run.
      */
     public static final int SINGLE_SET_NODE_RUN =
-        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
 
     /**
      * Default stop conditions of executed SET nodes.
@@ -132,9 +135,9 @@ public abstract class AbstractSymbolicExecutionTestCase {
     static {
         // Define fast mode
         if (FAST_MODE) {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN };
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN};
         } else {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN };
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN};
         }
         // Create temporary director for oracle files if required.
         File directory = null;
@@ -157,18 +160,18 @@ public abstract class AbstractSymbolicExecutionTestCase {
     /**
      * Creates a new oracle file.
      *
-     * @param node The node to save as oracle file.
+     * @param node                    The node to save as oracle file.
      * @param oraclePathInBaseDirFile The path in example directory.
-     * @param saveConstraints Save constraints?
-     * @param saveVariables Save variables?
-     * @param saveCallStack Save call stack?
-     * @param saveReturnValues Save method return values?
-     * @throws IOException Occurred Exception
+     * @param saveConstraints         Save constraints?
+     * @param saveVariables           Save variables?
+     * @param saveCallStack           Save call stack?
+     * @param saveReturnValues        Save method return values?
+     * @throws IOException         Occurred Exception
      * @throws ProofInputException Occurred Exception
      */
     protected static void createOracleFile(IExecutionNode<?> node, String oraclePathInBaseDirFile,
-            boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
-            boolean saveReturnValues) throws IOException, ProofInputException {
+                                           boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
+                                           boolean saveReturnValues) throws IOException, ProofInputException {
         if (tempNewOracleDirectory != null && tempNewOracleDirectory.isDirectory()) {
             // Create sub folder structure
             File oracleFile = new File(tempNewOracleDirectory, oraclePathInBaseDirFile);
@@ -176,7 +179,7 @@ protected static void createOracleFile(IExecutionNode<?> node, String oraclePath
             // Create oracle file
             ExecutionNodeWriter writer = new ExecutionNodeWriter();
             writer.write(node, ExecutionNodeWriter.DEFAULT_ENCODING, oracleFile, saveVariables,
-                saveCallStack, saveReturnValues, saveConstraints);
+                    saveCallStack, saveReturnValues, saveConstraints);
             // Print message to the user.
             printOracleDirectory();
         }
@@ -204,37 +207,37 @@ protected static void printOracleDirectory() {
     /**
      * Makes sure that the given nodes and their subtrees contains the same content.
      *
-     * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
-     * @param compareVariables Compare variables?
-     * @param compareCallStack Compare call stack?
-     * @param compareChildOrder Is the order of children relevant?
+     * @param expected            The expected {@link IExecutionNode}.
+     * @param current             The current {@link IExecutionNode}.
+     * @param compareVariables    Compare variables?
+     * @param compareCallStack    Compare call stack?
+     * @param compareChildOrder   Is the order of children relevant?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints Compare constraints?
+     * @param compareConstraints  Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
-            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+                                            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
+                                            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         if (compareChildOrder) {
             // Order of children must be the same.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(expected);
+                    new ExecutionNodePreorderIterator(expected);
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(current);
+                    new ExecutionNodePreorderIterator(current);
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                    compareCallStack, compareReturnValues, compareConstraints);
+                        compareCallStack, compareReturnValues, compareConstraints);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             // Order of children is not relevant.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(expected);
+                    new ExecutionNodePreorderIterator(expected);
             Set<IExecutionNode<?>> currentVisitedNodes = new LinkedHashSet<>();
             while (expectedExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
@@ -243,11 +246,11 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
                     fail("Node " + currentNext + " visited twice.");
                 }
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                    compareCallStack, compareReturnValues, compareConstraints);
+                        compareCallStack, compareReturnValues, compareConstraints);
             }
             // Make sure that each current node was visited
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(current);
+                    new ExecutionNodePreorderIterator(current);
             while (actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 if (!currentVisitedNodes.remove(currentNext)) {
@@ -261,13 +264,13 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
     /**
      * Searches the direct or indirect child in subtree of the node to search in.
      *
-     * @param toSearchIn The node to search in.
+     * @param toSearchIn    The node to search in.
      * @param childToSearch The node to search.
      * @return The found node.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearchIn,
-            IExecutionNode<?> childToSearch) throws ProofInputException {
+                                                           IExecutionNode<?> childToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(toSearchIn);
         assertNotNull(childToSearch);
@@ -288,20 +291,20 @@ protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearc
             }
         }
         assertNotNull(toSearchIn, "Direct or indirect Child " + childToSearch
-            + " is not contained in " + toSearchIn + ".");
+                + " is not contained in " + toSearchIn + ".");
         return toSearchIn;
     }
 
     /**
      * Searches the direct child. Nodes are equal if the name and the element type is equal.
      *
-     * @param parentToSearchIn The parent to search in its children.
+     * @param parentToSearchIn    The parent to search in its children.
      * @param directChildToSearch The child to search.
      * @return The found child.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> parentToSearchIn,
-            IExecutionNode<?> directChildToSearch) throws ProofInputException {
+                                                             IExecutionNode<?> directChildToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(parentToSearchIn);
         assertNotNull(directChildToSearch);
@@ -315,60 +318,60 @@ protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> paren
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
-                            ((IExecutionBranchCondition) directChildToSearch)
-                                    .getAdditionalBranchLabel())
+                        ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
+                        ((IExecutionBranchCondition) directChildToSearch)
+                                .getAdditionalBranchLabel())
                         && children[i].getElementType()
-                                .equals(directChildToSearch.getElementType())) {
+                        .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             } else {
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && children[i].getElementType()
-                                .equals(directChildToSearch.getElementType())) {
+                        .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             }
             i++;
         }
         assertNotNull(result,
-            "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
+                "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
         return result;
     }
 
     /**
      * Makes sure that the given nodes contains the same content. Children are not compared.
      *
-     * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
-     * @param compareParent Compare also the parent node?
-     * @param compareVariables Compare variables?
-     * @param compareCallStack Compare call stack?
+     * @param expected            The expected {@link IExecutionNode}.
+     * @param current             The current {@link IExecutionNode}.
+     * @param compareParent       Compare also the parent node?
+     * @param compareVariables    Compare variables?
+     * @param compareCallStack    Compare call stack?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints Compare constraints?
+     * @param compareConstraints  Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertExecutionNode(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareParent, boolean compareVariables, boolean compareCallStack,
-            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+                                              boolean compareParent, boolean compareVariables, boolean compareCallStack,
+                                              boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         // Compare nodes
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-            "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
+                "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
         assertEquals(expected.isPathConditionChanged(), current.isPathConditionChanged());
         if (!StringUtil.equalIgnoreWhiteSpace(expected.getFormatedPathCondition(),
-            current.getFormatedPathCondition())) {
+                current.getFormatedPathCondition())) {
             assertEquals(expected.getFormatedPathCondition(), current.getFormatedPathCondition());
         }
         if (compareParent) {
             if (expected instanceof IExecutionBlockStartNode<?>) {
                 assertTrue(current instanceof IExecutionBlockStartNode<?>);
                 assertEquals(((IExecutionBlockStartNode<?>) expected).isBlockOpened(),
-                    ((IExecutionBlockStartNode<?>) current).isBlockOpened());
+                        ((IExecutionBlockStartNode<?>) current).isBlockOpened());
                 assertBlockCompletions((IExecutionBlockStartNode<?>) expected,
-                    (IExecutionBlockStartNode<?>) current);
+                        (IExecutionBlockStartNode<?>) current);
             }
             assertCompletedBlocks(expected, current);
             assertOutgoingLinks(expected, current);
@@ -377,177 +380,177 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
         if (expected instanceof IExecutionBaseMethodReturn<?>) {
             assertTrue(current instanceof IExecutionBaseMethodReturn<?>);
             assertCallStateVariables((IExecutionBaseMethodReturn<?>) expected,
-                (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
+                    (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
         }
         if (expected instanceof IExecutionBranchCondition) {
             assertTrue(current instanceof IExecutionBranchCondition,
-                "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
+                    "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
-                    ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
-                "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
-                    + "\" but is \""
-                    + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
+                            ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
+                    "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
+                            + "\" but is \""
+                            + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
             assertEquals(((IExecutionBranchCondition) expected).isMergedBranchCondition(),
-                ((IExecutionBranchCondition) current).isMergedBranchCondition());
+                    ((IExecutionBranchCondition) current).isMergedBranchCondition());
             assertEquals(((IExecutionBranchCondition) expected).isBranchConditionComputed(),
-                ((IExecutionBranchCondition) current).isBranchConditionComputed());
+                    ((IExecutionBranchCondition) current).isBranchConditionComputed());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
-                    ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
-                "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
-                    + "\" but is \""
-                    + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
+                            ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
+                    "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
+                            + "\" but is \""
+                            + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStart) {
             assertTrue(current instanceof IExecutionStart, "Expected IExecutionStartNode but is "
-                + current.getClass() + ".");
+                    + current.getClass() + ".");
             assertTerminations((IExecutionStart) expected, (IExecutionStart) current);
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionTermination) {
             assertTrue(current instanceof IExecutionTermination,
-                "Expected IExecutionTermination but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionTermination but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionTermination) expected).getTerminationKind(),
-                ((IExecutionTermination) current).getTerminationKind());
+                    ((IExecutionTermination) current).getTerminationKind());
             assertEquals(((IExecutionTermination) expected).isBranchVerified(),
-                ((IExecutionTermination) current).isBranchVerified());
+                    ((IExecutionTermination) current).isBranchVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionBranchStatement) {
             assertTrue(current instanceof IExecutionBranchStatement,
-                "Expected IExecutionBranchStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionBranchStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopCondition) {
             assertTrue(current instanceof IExecutionLoopCondition,
-                "Expected IExecutionLoopCondition but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopCondition but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopStatement) {
             assertTrue(current instanceof IExecutionLoopStatement,
-                "Expected IExecutionLoopStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionMethodCall) {
             assertTrue(current instanceof IExecutionMethodCall,
-                "Expected IExecutionMethodCall but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionMethodCall but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             assertMethodReturns((IExecutionMethodCall) expected, (IExecutionMethodCall) current);
         } else if (expected instanceof IExecutionMethodReturn) {
             assertTrue(current instanceof IExecutionMethodReturn,
-                "Expected IExecutionMethodReturn but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionMethodReturn but is "
+                            + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
-                    ((IExecutionMethodReturn) current).getSignature()),
-                ((IExecutionMethodReturn) expected).getSignature() + " does not match "
-                    + ((IExecutionMethodReturn) current).getSignature());
+                    StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
+                            ((IExecutionMethodReturn) current).getSignature()),
+                    ((IExecutionMethodReturn) expected).getSignature() + " does not match "
+                            + ((IExecutionMethodReturn) current).getSignature());
             if (compareReturnValues) {
                 assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
-                        ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
-                    ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
-                        + " does not match "
-                        + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
+                        StringUtil.equalIgnoreWhiteSpace(
+                                ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
+                                ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
+                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
+                                + " does not match "
+                                + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
                 assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
-                        ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
-                    ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
-                        + " does not match "
-                        + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
+                        StringUtil.equalIgnoreWhiteSpace(
+                                ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
+                                ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
+                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
+                                + " does not match "
+                                + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
                 assertEquals(((IExecutionMethodReturn) expected).isReturnValuesComputed(),
-                    ((IExecutionMethodReturn) current).isReturnValuesComputed());
+                        ((IExecutionMethodReturn) current).isReturnValuesComputed());
             }
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
+                    StringUtil.equalIgnoreWhiteSpace(
                     ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition(),
                     ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition()
-                    + " does not match "
+                            + " does not match "
                     + ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             if (compareReturnValues) {
                 assertReturnValues(((IExecutionMethodReturn) expected).getReturnValues(),
-                    ((IExecutionMethodReturn) current).getReturnValues());
+                        ((IExecutionMethodReturn) current).getReturnValues());
             }
         } else if (expected instanceof IExecutionExceptionalMethodReturn) {
             assertTrue(current instanceof IExecutionExceptionalMethodReturn,
-                "Expected IExecutionExceptionalMethodReturn but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionExceptionalMethodReturn but is "
+                            + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionExceptionalMethodReturn) expected).getSignature(),
-                    ((IExecutionExceptionalMethodReturn) current).getSignature()),
-                ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
-                    + ((IExecutionExceptionalMethodReturn) current).getSignature());
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionExceptionalMethodReturn) expected).getSignature(),
+                            ((IExecutionExceptionalMethodReturn) current).getSignature()),
+                    ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
+                            + ((IExecutionExceptionalMethodReturn) current).getSignature());
             assertTrue(StringUtil.equalIgnoreWhiteSpace(
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition(),
                 ((IExecutionExceptionalMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition()
-                    + " does not match " + ((IExecutionExceptionalMethodReturn) current)
+                            + " does not match " + ((IExecutionExceptionalMethodReturn) current)
                             .getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStatement) {
             assertTrue(current instanceof IExecutionStatement,
-                "Expected IExecutionStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionOperationContract) {
             assertTrue(current instanceof IExecutionOperationContract,
-                "Expected IExecutionOperationContract but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionOperationContract but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionOperationContract) expected).isPreconditionComplied(),
-                ((IExecutionOperationContract) current).isPreconditionComplied());
+                    ((IExecutionOperationContract) current).isPreconditionComplied());
             assertEquals(((IExecutionOperationContract) expected).hasNotNullCheck(),
-                ((IExecutionOperationContract) current).hasNotNullCheck());
+                    ((IExecutionOperationContract) current).hasNotNullCheck());
             assertEquals(((IExecutionOperationContract) expected).isNotNullCheckComplied(),
-                ((IExecutionOperationContract) current).isNotNullCheckComplied());
+                    ((IExecutionOperationContract) current).isNotNullCheckComplied());
             assertEquals(((IExecutionOperationContract) expected).getFormatedResultTerm(),
-                ((IExecutionOperationContract) current).getFormatedResultTerm());
+                    ((IExecutionOperationContract) current).getFormatedResultTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedExceptionTerm(),
-                ((IExecutionOperationContract) current).getFormatedExceptionTerm());
+                    ((IExecutionOperationContract) current).getFormatedExceptionTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedSelfTerm(),
-                ((IExecutionOperationContract) current).getFormatedSelfTerm());
+                    ((IExecutionOperationContract) current).getFormatedSelfTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedContractParams(),
-                ((IExecutionOperationContract) current).getFormatedContractParams());
+                    ((IExecutionOperationContract) current).getFormatedContractParams());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopInvariant) {
             assertTrue(current instanceof IExecutionLoopInvariant,
-                "Expected IExecutionLoopInvariant but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopInvariant but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionLoopInvariant) expected).isInitiallyValid(),
-                ((IExecutionLoopInvariant) current).isInitiallyValid());
+                    ((IExecutionLoopInvariant) current).isInitiallyValid());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionAuxiliaryContract) {
             assertTrue(current instanceof IExecutionAuxiliaryContract,
-                "Expected IExecutionBlockContract but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionBlockContract but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionAuxiliaryContract) expected).isPreconditionComplied(),
-                ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
+                    ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionJoin) {
             assertTrue(current instanceof IExecutionJoin, "Expected IExecutionJoin but is "
-                + current.getClass() + ".");
+                    + current.getClass() + ".");
             assertEquals(((IExecutionJoin) expected).isWeakeningVerified(),
-                ((IExecutionJoin) current).isWeakeningVerified());
+                    ((IExecutionJoin) current).isWeakeningVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else {
@@ -559,22 +562,22 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
             IExecutionNode<?>[] currentStack = current.getCallStack();
             if (expectedStack != null) {
                 assertNotNull(currentStack,
-                    "Call stack of \"" + current + "\" should not be null.");
+                        "Call stack of \"" + current + "\" should not be null.");
                 assertEquals(expectedStack.length, currentStack.length, "Node: " + expected);
                 for (int i = 0; i < expectedStack.length; i++) {
                     assertExecutionNode(expectedStack[i], currentStack[i], false, false, false,
-                        false, false);
+                            false, false);
                 }
             } else {
                 assertTrue(currentStack == null || currentStack.length == 0,
-                    "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
-                        + "\" but should be null or empty.");
+                        "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
+                                + "\" but should be null or empty.");
             }
         }
         // Optionally compare parent
         if (compareParent) {
             assertExecutionNode(expected, current, false, compareVariables, compareCallStack,
-                compareReturnValues, compareConstraints);
+                    compareReturnValues, compareConstraints);
         }
     }
 
@@ -582,7 +585,7 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
      * Compares the outgoing links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -591,9 +594,9 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getOutgoingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Outgoing links of \"" + current + "\" should not be null.");
+                    "Outgoing links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                "Outgoing links: " + expected);
+                    "Outgoing links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -601,15 +604,15 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                    false, false, false);
+                        false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                    false, false, false);
+                        false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Outgoing links of \""
-                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -617,7 +620,7 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
      * Compares the incoming links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -626,9 +629,9 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getIncomingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Incoming links of \"" + current + "\" should not be null.");
+                    "Incoming links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                "Incoming links: " + expected);
+                    "Incoming links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -636,15 +639,15 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                    false, false, false);
+                        false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                    false, false, false);
+                        false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Incoming links of \""
-                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -652,29 +655,29 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
      * Compares the completed blocks.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCompletedBlocks(IExecutionNode<?> expected,
-            IExecutionNode<?> current) throws ProofInputException {
+                                                IExecutionNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionBlockStartNode<?>> expectedEntries = expected.getCompletedBlocks();
         ImmutableList<IExecutionBlockStartNode<?>> currentEntries = current.getCompletedBlocks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Completed blocks of \"" + current + "\" should not be null.");
+                    "Completed blocks of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBlockStartNode<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionBlockStartNode<?>> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionBlockStartNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionBlockStartNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, false, false,
-                    false, false, false);
+                        false, false, false);
                 String expectedCondition =
-                    expected.getFormatedBlockCompletionCondition(expectedNext);
+                        expected.getFormatedBlockCompletionCondition(expectedNext);
                 String currentCondition = current.getFormatedBlockCompletionCondition(currentNext);
                 if (!StringUtil.equalIgnoreWhiteSpace(expectedCondition, currentCondition)) {
                     assertEquals(expectedCondition, currentCondition);
@@ -684,8 +687,8 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Completed block entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Completed block entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -693,33 +696,33 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
      * Compares the block completions.
      *
      * @param expected The expected {@link IExecutionBlockStartNode}.
-     * @param current The current {@link IExecutionBlockStartNode}.
+     * @param current  The current {@link IExecutionBlockStartNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expected,
-            IExecutionBlockStartNode<?> current) throws ProofInputException {
+                                                 IExecutionBlockStartNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionNode<?>> expectedEntries = expected.getBlockCompletions();
         ImmutableList<IExecutionNode<?>> currentEntries = current.getBlockCompletions();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Block completions of \"" + current + "\" should not be null.");
+                    "Block completions of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionNode<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionNode<?>> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Block completion entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Block completion entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -727,34 +730,34 @@ protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expecte
      * Compares the method returns.
      *
      * @param expected The expected {@link IExecutionMethodCall}.
-     * @param current The current {@link IExecutionMethodCall}.
+     * @param current  The current {@link IExecutionMethodCall}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertMethodReturns(IExecutionMethodCall expected,
-            IExecutionMethodCall current) throws ProofInputException {
+                                              IExecutionMethodCall current) throws ProofInputException {
         ImmutableList<IExecutionBaseMethodReturn<?>> expectedEntries = expected.getMethodReturns();
         ImmutableList<IExecutionBaseMethodReturn<?>> currentEntries = current.getMethodReturns();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Method return of \"" + current + "\" should not be null.");
+                    "Method return of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBaseMethodReturn<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionBaseMethodReturn<?>> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Method return entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Method return entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -762,7 +765,7 @@ protected static void assertMethodReturns(IExecutionMethodCall expected,
      * Compares the terminations.
      *
      * @param expected The expected {@link IExecutionStart}.
-     * @param current The current {@link IExecutionStart}.
+     * @param current  The current {@link IExecutionStart}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertTerminations(IExecutionStart expected, IExecutionStart current)
@@ -773,22 +776,22 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
             assertNotNull(currentEntries, "Termination of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionTermination> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionTermination> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Termination entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Termination entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -796,11 +799,11 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
      * Makes sure that the given nodes contains the same {@link IExecutionMethodReturnValue}s.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}s.
-     * @param current The current {@link IExecutionMethodReturnValue}s.
+     * @param current  The current {@link IExecutionMethodReturnValue}s.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
-            IExecutionMethodReturnValue[] current) throws ProofInputException {
+                                             IExecutionMethodReturnValue[] current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertEquals(expected.length, current.length);
@@ -813,36 +816,36 @@ protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
      * Makes sure that the given {@link IExecutionMethodReturnValue}s are the same.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}.
-     * @param current The current {@link IExecutionMethodReturnValue}.
+     * @param current  The current {@link IExecutionMethodReturnValue}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValue(IExecutionMethodReturnValue expected,
-            IExecutionMethodReturnValue current) throws ProofInputException {
+                                            IExecutionMethodReturnValue current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-            expected.getName() + " does not match " + current.getName());
+                expected.getName() + " does not match " + current.getName());
         assertTrue(
-            StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
-                current.getReturnValueString()),
-            expected.getReturnValueString() + " does not match " + current.getReturnValueString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
+                        current.getReturnValueString()),
+                expected.getReturnValueString() + " does not match " + current.getReturnValueString());
         assertEquals(expected.hasCondition(), current.hasCondition());
         assertTrue(
-            StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                current.getConditionString()),
-            expected.getConditionString() + " does not match " + current.getConditionString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                        current.getConditionString()),
+                expected.getConditionString() + " does not match " + current.getConditionString());
     }
 
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionNode}s.
      *
-     * @param expected The expected node.
-     * @param current The current node.
+     * @param expected           The expected node.
+     * @param current            The current node.
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareConstraints) throws ProofInputException {
+                                            boolean compareConstraints) throws ProofInputException {
         if (compareConstraints) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -856,26 +859,26 @@ protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNo
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraints.
-     * @param current The current constraints.
+     * @param current  The current constraints.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionConstraint[] expected,
-            IExecutionConstraint[] current) throws ProofInputException {
+                                            IExecutionConstraint[] current) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionConstraint> availableCurrentVariables =
-            new ArrayList<>(Arrays.asList(current));
+                new ArrayList<>(Arrays.asList(current));
         for (final IExecutionConstraint expectedVariable : expected) {
             // Find current variable with same name
             IExecutionConstraint currentVariable = CollectionUtil.searchAndRemove(
-                availableCurrentVariables, element -> {
-                    try {
-                        return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                            element.getName());
-                    } catch (ProofInputException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
+                    availableCurrentVariables, element -> {
+                        try {
+                            return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
+                                    element.getName());
+                        } catch (ProofInputException e) {
+                            throw new RuntimeException(e);
+                        }
+                    });
             assertNotNull(currentVariable);
             // Compare variables
             assertConstraint(expectedVariable, currentVariable);
@@ -887,11 +890,11 @@ protected static void assertConstraints(IExecutionConstraint[] expected,
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraint.
-     * @param current The current constraint.
+     * @param current  The current constraint.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraint(IExecutionConstraint expected,
-            IExecutionConstraint current) throws ProofInputException {
+                                           IExecutionConstraint current) throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             if (!StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName())) {
@@ -906,15 +909,15 @@ protected static void assertConstraint(IExecutionConstraint expected,
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s of the call
      * state.
      *
-     * @param expected The expected node.
-     * @param current The current node.
-     * @param compareVariables Compare variables?
+     * @param expected           The expected node.
+     * @param current            The current node.
+     * @param compareVariables   Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> expected,
-            IExecutionBaseMethodReturn<?> current, boolean compareVariables,
-            boolean compareConstraints) throws ProofInputException {
+                                                   IExecutionBaseMethodReturn<?> current, boolean compareVariables,
+                                                   boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -927,14 +930,14 @@ protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> exp
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s.
      *
-     * @param expected The expected node.
-     * @param current The current node.
-     * @param compareVariables Compare variables?
+     * @param expected           The expected node.
+     * @param current            The current node.
+     * @param compareVariables   Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareVariables, boolean compareConstraints) throws ProofInputException {
+                                          boolean compareVariables, boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -947,27 +950,27 @@ protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected The expected variables.
-     * @param current The current variables.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variables.
+     * @param current            The current variables.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionVariable[] expected,
-            IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
-            boolean compareConstraints) throws ProofInputException {
+                                          IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
+                                          boolean compareConstraints) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionVariable> availableCurrentVariables =
-            new ArrayList<>(Arrays.asList(current));
+                new ArrayList<>(Arrays.asList(current));
         for (final IExecutionVariable expectedVariable : expected) {
             // Find current variable with same name
             IExecutionVariable currentVariable = CollectionUtil
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                element.getName());
+                                    element.getName());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -975,7 +978,7 @@ protected static void assertVariables(IExecutionVariable[] expected,
             assertNotNull(currentVariable);
             // Compare variables
             assertVariable(expectedVariable, currentVariable, compareParent, compareChildren,
-                compareConstraints);
+                    compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -983,15 +986,15 @@ protected static void assertVariables(IExecutionVariable[] expected,
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected The expected variable.
-     * @param current The current variable.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variable.
+     * @param current            The current variable.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariable(IExecutionVariable expected, IExecutionVariable current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                         boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
@@ -1002,7 +1005,7 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
             // Compare parent
             if (compareParent) {
                 assertValue(expected.getParentValue(), current.getParentValue(), false, false,
-                    false);
+                        false);
             }
             // Compare children
             if (compareChildren) {
@@ -1018,15 +1021,15 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected The expected values.
-     * @param current The current values.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected values.
+     * @param current            The current values.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValues(IExecutionValue[] expected, IExecutionValue[] current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                       boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
@@ -1037,10 +1040,10 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                element.getName())
+                                    element.getName())
                                     && StringUtil.equalIgnoreWhiteSpace(
-                                        expectedVariable.getConditionString(),
-                                        element.getConditionString());
+                                    expectedVariable.getConditionString(),
+                                    element.getConditionString());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -1048,7 +1051,7 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
             assertNotNull(currentVariable);
             // Compare variables
             assertValue(expectedVariable, currentVariable, compareParent, compareChildren,
-                compareConstraints);
+                    compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -1056,43 +1059,43 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected The expected variable.
-     * @param current The current variable.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variable.
+     * @param current            The current variable.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValue(IExecutionValue expected, IExecutionValue current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                      boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             // Compare variable
             assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                expected.getName() + " does not match " + current.getName());
+                    expected.getName() + " does not match " + current.getName());
             assertEquals(expected.getTypeString(), current.getTypeString());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
-                    current.getValueString()),
-                expected.getValueString() + " does not match " + current.getValueString());
+                    StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
+                            current.getValueString()),
+                    expected.getValueString() + " does not match " + current.getValueString());
             assertEquals(expected.isValueAnObject(), current.isValueAnObject());
             assertEquals(expected.isValueUnknown(), current.isValueUnknown());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                    current.getConditionString()),
-                expected.getConditionString() + " does not match " + current.getConditionString());
+                    StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                            current.getConditionString()),
+                    expected.getConditionString() + " does not match " + current.getConditionString());
             // Compare parent
             if (compareParent) {
                 assertVariable(expected.getVariable(), current.getVariable(), false, false,
-                    compareConstraints);
+                        compareConstraints);
             }
             // Compare children
             if (compareChildren) {
                 IExecutionVariable[] expectedChildVariables = expected.getChildVariables();
                 IExecutionVariable[] currentChildVariables = current.getChildVariables();
                 assertVariables(expectedChildVariables, currentChildVariables, compareParent,
-                    compareChildren, compareConstraints);
+                        compareChildren, compareConstraints);
             }
             // Compare constraints
             if (compareConstraints) {
@@ -1109,37 +1112,41 @@ protected static void assertValue(IExecutionValue expected, IExecutionValue curr
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepReturn(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                     SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                     String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -1147,164 +1154,182 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
+                                                    SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                                    String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         stopCondition.addChildren(lineBreakpoints);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            // Run proof
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step over" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepOver(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                   SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                   String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepOverSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            // Run proof
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
      * @return The found {@link SymbolicExecutionCompletions}.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                                           SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                                           String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        SymbolicExecutionCompletions completions = builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
-        return completions;
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+
+            // Update symbolic execution tree
+            SymbolicExecutionCompletions completions = builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+            return completions;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void resume(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
+                                 SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-            String oraclePathInBaseDirFile, File baseDir)
+                                                 String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         if (CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
             createOracleFile(builder.getStartNode(), oraclePathInBaseDirFile, false, false, false,
-                false);
+                    false);
         } else {
             // Read oracle file
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
@@ -1313,41 +1338,41 @@ protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builde
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, builder.getStartNode(), false, false, false, false,
-                false);
+                    false);
         }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-            String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
-            File baseDir)
+                                                 String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
+                                                 File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         assertSetTreeAfterStep(builder,
-            oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
+                oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
     }
 
     /**
      * Searches a {@link IProgramMethod} in the given {@link Services}.
      *
-     * @param services The {@link Services} to search in.
+     * @param services          The {@link Services} to search in.
      * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
+     * @param methodFullName    The method name to search.
      * @return The first found {@link IProgramMethod} in the type.
      */
     public static IProgramMethod searchProgramMethod(Services services, String containerTypeName,
-            final String methodFullName) {
+                                                     final String methodFullName) {
         return HelperClassForTests.searchProgramMethod(services, containerTypeName, methodFullName);
     }
 
@@ -1356,29 +1381,29 @@ public static IProgramMethod searchProgramMethod(Services services, String conta
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param baseContractName The name of the contract.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param baseContractName                    The name of the contract.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String baseContractName,
@@ -1392,26 +1417,26 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
-            null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
+                null, null, null, true);
         setupTacletOptions(environment);
         // Start proof
         final Contract contract = environment.getServices().getSpecificationRepository()
                 .getContractByName(baseContractName);
         assertTrue(contract instanceof FunctionalOperationContract);
         ProofOblInput input = new FunctionalOperationContractPO(environment.getInitConfig(),
-            (FunctionalOperationContract) contract, true, true);
+                (FunctionalOperationContract) contract, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1423,30 +1448,30 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
-     * @param precondition An optional precondition to use.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The name of the type which contains the method.
+     * @param methodFullName                      The method name to search.
+     * @param precondition                        An optional precondition to use.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1460,25 +1485,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodPO(environment.getInitConfig(), pm.getFullName(), pm,
-            precondition, true, true);
+                precondition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1501,26 +1526,26 @@ private static void setupTacletOptions(KeYEnvironment<?> env) {
      * Creates a {@link SymbolicExecutionEnvironment} which consists of loading a proof file to load
      * and creation with configuration of {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofPathInBaseDir The path to the proof file inside the base directory.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofPathInBaseDir                  The path to the proof file inside the base directory.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
      */
@@ -1537,20 +1562,20 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(proofFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
-            null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
+                null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
         setupTacletOptions(environment);
         Proof proof = environment.getLoadedProof();
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1562,32 +1587,32 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
-     * @param precondition An optional precondition to use.
-     * @param startPosition The start position.
-     * @param endPosition The end position.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The name of the type which contains the method.
+     * @param methodFullName                      The method name to search.
+     * @param precondition                        An optional precondition to use.
+     * @param startPosition                       The start position.
+     * @param endPosition                         The end position.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1602,25 +1627,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodSubsetPO(environment.getInitConfig(), methodFullName,
-            pm, precondition, startPosition, endPosition, true, true);
+                pm, precondition, startPosition, endPosition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1645,7 +1670,7 @@ protected String getTryContent(Proof proof) {
         JavaProgramElement updateContent = updateApplication.subs().get(1).javaBlock().program();
         assertTrue(updateContent instanceof StatementBlock);
         ImmutableArray<? extends Statement> updateContentBody =
-            ((StatementBlock) updateContent).getBody();
+                ((StatementBlock) updateContent).getBody();
         assertEquals(2, updateContentBody.size());
         assertTrue(updateContentBody.get(1) instanceof Try);
         Try tryStatement = (Try) updateContentBody.get(1);
@@ -1656,39 +1681,39 @@ protected String getTryContent(Proof proof) {
     /**
      * Makes sure that the save and loading process works.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param baseDir                 The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir       The path to the java file inside the base directory.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param env The already executed {@link SymbolicExecutionEnvironment} which contains the proof
-     *        to save/load.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param env                     The already executed {@link SymbolicExecutionEnvironment} which contains the proof
+     *                                to save/load.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
-            String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
+                                       String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         File javaFile = new File(baseDir, javaPathInBaseDir);
         assertTrue(javaFile.exists());
         File tempFile =
-            File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
+                File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
         KeYEnvironment<DefaultUserInterfaceControl> reloadedEnv = null;
         SymbolicExecutionTreeBuilder reloadedBuilder = null;
         try {
             ProofSaver saver = new ProofSaver(env.getProof(), tempFile.getAbsolutePath(),
-                KeYConstants.INTERNAL_VERSION);
+                    KeYConstants.INTERNAL_VERSION);
             assertNull(saver.save());
             // Load proof from saved *.proof file
             reloadedEnv = KeYEnvironment.load(SymbolicExecutionJavaProfile.getDefaultInstance(),
-                tempFile, null, null, null, true);
+                    tempFile, null, null, null, true);
             Proof reloadedProof = reloadedEnv.getLoadedProof();
             assertNotSame(env.getProof(), reloadedProof);
             // Recreate symbolic execution tree
             reloadedBuilder =
-                new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
+                    new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
             SymbolicExecutionUtil.initializeStrategy(reloadedBuilder);
             reloadedBuilder.analyse();
             assertSetTreeAfterStep(reloadedBuilder, oraclePathInBaseDirFile, baseDir);
@@ -1717,59 +1742,59 @@ protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
+     * @param baseDir                               The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                     The path to the java file inside the base directory.
+     * @param containerTypeName                     The java class to test.
+     * @param methodFullName                        The method to test.
+     * @param precondition                          An optional precondition.
+     * @param oraclePathInBaseDirFile               The path to the oracle file inside the base directory.
+     * @param includeConstraints                    Include constraints?
+     * @param includeVariables                      Include variables?
+     * @param includeCallStack                      Include call stack?
+     * @param includeReturnValues                   Include method return values?
      * @param maximalNumberOfExecutedSetNodesPerRun The number of executed set nodes per auto mode
-     *        run. The whole test is executed for each defined value.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
-     * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                              run. The whole test is executed for each defined value.
+     * @param mergeBranchConditions                 Merge branch conditions?
+     * @param useOperationContracts                 Use operation contracts?
+     * @param useLoopInvariants                     Use loop invariants?
+     * @param blockTreatmentContract                Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs    {@code true} hide non execution branch labels by
+     *                                              side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                           Do alias checks?
+     * @param useUnicode                            {@code true} use unicode characters, {@code false} do not use unicode
+     *                                              characters.
+     * @param usePrettyPrinting                     {@code true} use pretty printing, {@code false} do not use pretty
+     *                                              printing.
+     * @param variablesAreOnlyComputedFromUpdates   {@code true} {@link IExecutionVariable} are only
+     *                                              computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                              according to the type structure of the visible memory.
+     * @param simplifyConditions                    {@code true} simplify conditions, {@code false} do not simplify
+     *                                              conditions.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTest(File baseDir, String javaPathInBaseDir, String containerTypeName,
-            String methodFullName, String precondition, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
-            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                             String methodFullName, String precondition, String oraclePathInBaseDirFile,
+                             boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                             boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
+                             boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+                             boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                             boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                             boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         assertNotNull(maximalNumberOfExecutedSetNodesPerRun);
         for (int j : maximalNumberOfExecutedSetNodesPerRun) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env = doSETTest(baseDir,
-                javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                includeReturnValues, j,
-                mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                    javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                    oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                    includeReturnValues, j,
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
             env.dispose();
         }
     }
@@ -1778,57 +1803,57 @@ protected void doSETTest(File baseDir, String javaPathInBaseDir, String containe
      * Executes method <code>doTest</code>
      * and disposes the created {@link SymbolicExecutionEnvironment}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The java class to test.
+     * @param methodFullName                      The method to test.
+     * @param precondition                        An optional precondition.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
-            String containerTypeName, String methodFullName, String precondition,
-            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-            boolean includeCallStack, boolean includeReturnValues,
-            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                                       String containerTypeName, String methodFullName, String precondition,
+                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+                                       boolean includeCallStack, boolean includeReturnValues,
+                                       int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+                                       boolean useOperationContracts, boolean useLoopInvariants,
+                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                       boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-            doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                        oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                        includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
+                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                        variablesAreOnlyComputedFromUpdates, simplifyConditions);
         env.dispose();
     }
 
@@ -1845,47 +1870,47 @@ protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
-            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-            boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
+                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+                                       boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
+                                       boolean useOperationContracts, boolean useLoopInvariants,
+                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                       boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-            doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
-                includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                variablesAreOnlyComputedFromUpdates, false, true);
+                doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
+                        includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
+                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                        variablesAreOnlyComputedFromUpdates, false, true);
         if (env != null) {
             env.dispose();
         }
@@ -1904,47 +1929,47 @@ protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-            boolean simplifyConditions) throws ProofInputException, IOException,
+                                                                                  String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
+                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                                                                  boolean includeReturnValues, boolean mergeBranchConditions,
+                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         boolean originalOneStepSimplification = isOneStepSimplificationEnabled(null);
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env;
@@ -1955,26 +1980,26 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             // Make sure that the correct taclet options are defined.
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             env = createSymbolicExecutionEnvironment(baseDir, proofFilePathInBaseDir,
-                mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
-                simplifyConditions);
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
+                    simplifyConditions);
             // Create new oracle file if required in a temporary directory
             createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                    includeConstraints, includeVariables, includeCallStack, includeReturnValues);
             // Read oracle file
             ExecutionNodeReader reader = new ExecutionNodeReader();
             IExecutionNode<?> oracleRoot = reader.read(oracleFile);
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                includeCallStack, false, includeReturnValues, includeConstraints);
+                    includeCallStack, false, includeReturnValues, includeConstraints);
             return env;
         } finally {
             // Restore original options
@@ -1995,49 +2020,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The java class to test.
+     * @param methodFullName                      The method to test.
+     * @param precondition                        An optional precondition.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String javaPathInBaseDir, String containerTypeName, final String methodFullName,
-            String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
-            boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
-            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                                                                                  String javaPathInBaseDir, String containerTypeName, final String methodFullName,
+                                                                                  String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
+                                                                                  boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
+                                                                                  int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
@@ -2051,23 +2076,23 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions = setDefaultTacletOptions(baseDir, javaPathInBaseDir,
-                containerTypeName, methodFullName);
+                    containerTypeName, methodFullName);
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                    methodFullName, precondition, mergeBranchConditions, useOperationContracts,
-                    useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
-                    aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                    simplifyConditions);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                            methodFullName, precondition, mergeBranchConditions, useOperationContracts,
+                            useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
+                            aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                            simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                includeCallStack, includeReturnValues);
+                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                    includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore original options
@@ -2089,49 +2114,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param baseContractName The name of the contract.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param baseContractName                    The name of the contract.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
-            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-            boolean simplifyConditions) throws ProofInputException, IOException,
+                                                                                  String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
+                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                                                                  boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
+                                                                                  boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
         try {
@@ -2142,22 +2167,22 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions =
-                setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
+                    setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
-                    useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                    truthValueEvaluationEnabled, simplifyConditions);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
+                            mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                            blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
+                            useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                            truthValueEvaluationEnabled, simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                includeCallStack, includeReturnValues);
+                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                    includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore taclet options
@@ -2169,67 +2194,72 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * Internal test method
      */
     private void internalDoSETTest(File oracleFile,
-            SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
-            String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues)
+                                   SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
+                                   String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
+                                   boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                   boolean includeReturnValues)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
         env.getProof().getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         int nodeCount;
         // Execute auto mode until no more symbolic execution tree nodes are found or no new rules
         // are applied.
         do {
-            // Store the number of nodes before start of the auto mode
-            nodeCount = env.getProof().countNodes();
-            // Run proof
-            env.getProofControl().startAndWaitForAutoMode(env.getProof());
-            // Update symbolic execution tree
-            env.getBuilder().analyse();
-            // Make sure that not to many set nodes are executed
-            Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
-            for (Integer value : executedSetNodesPerGoal.values()) {
-                assertNotNull(value);
-                assertTrue(value <= maximalNumberOfExecutedSetNodes,
-                    value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+            try {
+                // Store the number of nodes before start of the auto mode
+                nodeCount = env.getProof().countNodes();
+                // Run proof
+                env.getProofControl().startAndWaitForAutoMode(env.getProof());
+
+                // Update symbolic execution tree
+                env.getBuilder().analyse();
+                // Make sure that not to many set nodes are executed
+                Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
+                for (Integer value : executedSetNodesPerGoal.values()) {
+                    assertNotNull(value);
+                    assertTrue(value <= maximalNumberOfExecutedSetNodes,
+                            value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
             }
         } while (stopCondition.wasSetNodeExecuted() && nodeCount != env.getProof().countNodes());
         // Create new oracle file if required in a temporary directory
         createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-            includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
         // Read oracle file
         ExecutionNodeReader reader = new ExecutionNodeReader();
         IExecutionNode<?> oracleRoot = reader.read(oracleFile);
         assertNotNull(oracleRoot);
         // Make sure that the created symbolic execution tree matches the expected one.
         assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-            includeCallStack, false, includeReturnValues, includeConstraints);
+                includeCallStack, false, includeReturnValues, includeConstraints);
     }
 
     /**
      * Ensures that the default taclet options are defined.
      *
      * @param javaPathInBaseDir The path in the base directory to the java file.
-     * @param baseContractName The name of the contract to prove.
+     * @param baseContractName  The name of the contract to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseDir,
-            String baseContractName)
+                                                              String baseContractName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
-                    baseContractName,
-                    false, false, false,
-                    false, false, false,
-                    false, false, false,
-                    false, false);
+                    createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
+                            baseContractName,
+                            false, false, false,
+                            false, false, false,
+                            false, false, false,
+                            false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2238,26 +2268,26 @@ public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseD
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param baseDir The base directory which contains the java file.
+     * @param baseDir           The base directory which contains the java file.
      * @param javaPathInBaseDir The path in the base directory to the java file.
      * @param containerTypeName name of the type where the method is implemented/declared
-     * @param methodFullName The method to prove.
+     * @param methodFullName    The method to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(File baseDir,
-            String javaPathInBaseDir,
-            String containerTypeName,
-            String methodFullName)
+                                                              String javaPathInBaseDir,
+                                                              String containerTypeName,
+                                                              String methodFullName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                    methodFullName,
-                    null, false, false, false,
-                    false, false, false, false,
-                    false, false, false);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                            methodFullName,
+                            null, false, false, false,
+                            false, false, false, false,
+                            false, false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2266,19 +2296,19 @@ public static Map<String, String> setDefaultTacletOptions(File baseDir,
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param javaFile The java file to load.
+     * @param javaFile          The java file to load.
      * @param containerTypeName The type name which provides the target.
-     * @param targetName The target to proof.
+     * @param targetName        The target to proof.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     @SuppressWarnings("unused")
     public static Map<String, String> setDefaultTacletOptionsForTarget(File javaFile,
-            String containerTypeName, final String targetName)
+                                                                       String containerTypeName, final String targetName)
             throws ProblemLoaderException, ProofInputException {
         return HelperClassForTests.setDefaultTacletOptionsForTarget(javaFile, containerTypeName,
-            targetName);
+                targetName);
     }
 
     /**
@@ -2312,14 +2342,14 @@ public static void restoreTacletOptions(Map<String, String> options) {
     protected ITermProgramVariableCollectorFactory createNewProgramVariableCollectorFactory(
             final SymbolicExecutionBreakpointStopCondition breakpointParentStopCondition) {
         return services -> new TermProgramVariableCollectorKeepUpdatesForBreakpointconditions(
-            services, breakpointParentStopCondition);
+                services, breakpointParentStopCondition);
     }
 
     /**
      * Makes sure that two {@link Term}s are equal.
      *
      * @param expected The expected {@link Term}.
-     * @param actual The actual {@link Term}.
+     * @param actual   The actual {@link Term}.
      */
     protected void assertTerm(Term expected, Term actual) {
         if (expected != null) {
@@ -2339,7 +2369,7 @@ protected void assertTerm(Term expected, Term actual) {
      * Checks if one-step simplification is enabled in the given {@link Proof}.
      *
      * @param proof The {@link Proof} to read from or {@code null} to return the general settings
-     *        value.
+     *              value.
      * @return {@code true} one step simplification is enabled, {@code false} if disabled.
      */
     public static boolean isOneStepSimplificationEnabled(Proof proof) {
@@ -2349,9 +2379,9 @@ public static boolean isOneStepSimplificationEnabled(Proof proof) {
     /**
      * Defines if one-step simplification is enabled in general and within the {@link Proof}.
      *
-     * @param proof The optional {@link Proof}.
+     * @param proof   The optional {@link Proof}.
      * @param enabled {@code true} use one-step simplification, {@code false} do not use one-step
-     *        simplification.
+     *                simplification.
      */
     public static void setOneStepSimplificationEnabled(Proof proof, boolean enabled) {
         HelperClassForTests.setOneStepSimplificationEnabled(proof, enabled);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
deleted file mode 100644
index 3be1d2528d8..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.uka.ilkd.key;
-
-/**
- * @author Alexander Weigl
- * @version 1 (14.10.23)
- */
-public interface Identifiable {
-    default String identification() {
-        return getClass().getName() + "_" + hashCode();
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
index 0d3fd45622c..29a34424d09 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
@@ -550,19 +550,12 @@ protected void fireAutoModeStopped(ProofEvent e) {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void startAutoMode(Proof proof) {
-        startAutoMode(proof, proof.openEnabledGoals());
-    }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof) {
+    public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
         startAutoMode(proof);
         waitWhileAutoMode();
     }
@@ -571,7 +564,7 @@ public void startAndWaitForAutoMode(Proof proof) {
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) {
+    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException {
         startAutoMode(proof, goals);
         waitWhileAutoMode();
     }
@@ -580,7 +573,7 @@ public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) {
      * {@inheritDoc}
      */
     @Override
-    public void stopAndWaitAutoMode() {
+    public void stopAndWaitAutoMode() throws InterruptedException {
         stopAutoMode();
         waitWhileAutoMode();
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
index df59e0c1ae7..48dda5aa1f3 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
@@ -16,9 +16,11 @@
 import de.uka.ilkd.key.prover.impl.ApplyStrategy;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
 import de.uka.ilkd.key.util.ProofStarter;
-
 import org.key_project.util.collection.ImmutableList;
 
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * The default implementation of {@link ProofControl}.
  *
@@ -35,15 +37,20 @@ public class DefaultProofControl extends AbstractProofControl {
      */
     private Thread autoModeThread;
 
+    /**
+     * A condition which is non-null during auto-mode. You can wait for end of macro/auto on it.
+     */
+    private Condition inAutoMode;
+
     /**
      * Constructor.
      *
-     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *        to all started {@link ApplyStrategy} instances.
+     *                                  to all started {@link ApplyStrategy} instances.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-            DefaultUserInterfaceControl defaultProverTaskListener) {
+                               DefaultUserInterfaceControl defaultProverTaskListener) {
         super(defaultProverTaskListener);
         this.ui = ui;
     }
@@ -51,21 +58,21 @@ public DefaultProofControl(UserInterfaceControl ui,
     /**
      * Constructor.
      *
-     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *        to all started {@link ApplyStrategy} instances.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     *                                  to all started {@link ApplyStrategy} instances.
+     * @param ruleCompletionHandler     An optional {@link RuleCompletionHandler}.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-            DefaultUserInterfaceControl defaultProverTaskListener,
-            RuleCompletionHandler ruleCompletionHandler) {
+                               DefaultUserInterfaceControl defaultProverTaskListener,
+                               RuleCompletionHandler ruleCompletionHandler) {
         super(defaultProverTaskListener, ruleCompletionHandler);
         this.ui = ui;
     }
 
     @Override
     public synchronized void startAutoMode(Proof proof, ImmutableList<Goal> goals,
-            ProverTaskListener ptl) {
+                                           ProverTaskListener ptl) {
         if (!isInAutoMode()) {
             autoModeThread = new AutoModeThread(proof, goals, ptl);
             autoModeThread.start();
@@ -79,19 +86,17 @@ public synchronized void stopAutoMode() {
         }
     }
 
+
     @Override
-    public void waitWhileAutoMode() {
-        while (isInAutoMode()) { // Wait until auto mode has stopped.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-            }
+    public void waitWhileAutoMode() throws InterruptedException {
+        if (inAutoMode != null) {
+            inAutoMode.await();
         }
     }
 
     @Override
     public boolean isInAutoMode() {
-        return autoModeThread != null;
+        return inAutoMode != null;
     }
 
     private class AutoModeThread extends Thread {
@@ -105,6 +110,9 @@ public AutoModeThread(Proof proof, ImmutableList<Goal> goals, ProverTaskListener
             this.proof = proof;
             this.goals = goals;
             this.ptl = ptl;
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -113,7 +121,7 @@ public void run() {
                 fireAutoModeStarted(new ProofEvent(proof));
                 ProofStarter starter = ptl != null
                         ? new ProofStarter(
-                            new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
+                        new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
                         : new ProofStarter(getDefaultProverTaskListener(), false);
                 starter.init(proof);
                 if (goals != null) {
@@ -122,6 +130,8 @@ public void run() {
                     starter.start();
                 }
             } finally {
+                inAutoMode.signalAll();
+                inAutoMode = null;
                 autoModeThread = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
@@ -150,6 +160,9 @@ public MacroThread(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
             this.node = node;
             this.macro = macro;
             this.posInOcc = posInOcc;
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -172,7 +185,9 @@ public void run() {
                 if (ptl != null) {
                     ptl.taskFinished(info);
                 }
+                inAutoMode.signalAll();
                 autoModeThread = null;
+                inAutoMode = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
         }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index 77b71eaf5df..f30b7bb97d1 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
@@ -123,7 +123,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode of.
      */
-    void startAutoMode(Proof proof);
+    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals());}
 
     /**
      * Starts the auto mode for the given {@link Proof} and the given {@link Goal}s.
@@ -143,13 +143,13 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * Stops the currently running auto mode and blocks the current {@link Thread} until auto mode
      * has stopped.
      */
-    void stopAndWaitAutoMode();
+    void stopAndWaitAutoMode() throws InterruptedException;
 
     /**
      * Blocks the current {@link Thread} while the auto mode of this {@link UserInterfaceControl} is
      * active.
      */
-    void waitWhileAutoMode();
+    void waitWhileAutoMode() throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -158,7 +158,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * @param proof The {@link Proof} to start auto mode and to wait for.
      * @param goals The {@link Goal}s to close.
      */
-    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals);
+    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -166,7 +166,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode and to wait for.
      */
-    void startAndWaitForAutoMode(Proof proof);
+    void startAndWaitForAutoMode(Proof proof) throws InterruptedException;
 
     void startFocussedAutoMode(PosInOccurrence focus, Goal goal);
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
index 962228f3ca8..ebe8d366f00 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
index 2844075269b..d024e192f97 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
@@ -35,7 +35,7 @@ public void taskStarted(TaskStartedInfo info) {
         numOfInvokedMacros++;
         if (superordinateListener != null) {
             superordinateListener.taskStarted(new DefaultTaskStartedInfo(TaskKind.Macro,
-                macroName + (macroName.length() == 0 ? "" : " -- ") + info.message(),
+                macroName + (macroName.isEmpty() ? "" : " -- ") + info.message(),
                 info.size()));
         }
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 533828bb803..06da529607f 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -23,13 +23,15 @@
 import de.uka.ilkd.key.rule.RuleApp;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.util.Pair;
-
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.lookup.Lookup;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -49,10 +51,14 @@ public class Node implements Iterable<Node> {
 
     private static final String NODES = "nodes";
 
-    /** the proof the node belongs to */
+    /**
+     * the proof the node belongs to
+     */
     private final Proof proof;
 
-    /** The parent node. **/
+    /**
+     * The parent node.
+     **/
     private Node parent = null;
     /**
      * The branch location of this proof node.
@@ -81,7 +87,9 @@ public class Node implements Iterable<Node> {
 
     private boolean closed = false;
 
-    /** contains non-logical content, used for user feedback */
+    /**
+     * contains non-logical content, used for user feedback
+     */
     private NodeInfo nodeInfo;
 
     /**
@@ -119,7 +127,7 @@ public class Node implements Iterable<Node> {
      * taclet with an addrule section on this node, then these taclets are stored in this list
      */
     private ImmutableSet<NoPosTacletApp> localIntroducedRules =
-        DefaultImmutableSet.nil();
+            DefaultImmutableSet.nil();
 
     /**
      * Holds the undo methods for the information added by rules to the {@code Goal.strategyInfos}.
@@ -162,7 +170,9 @@ public void setSequent(Sequent seq) {
         this.seq = seq;
     }
 
-    /** returns the sequent of this node */
+    /**
+     * returns the sequent of this node
+     */
     public Sequent sequent() {
         return seq;
     }
@@ -176,7 +186,9 @@ public NodeInfo getNodeInfo() {
         return nodeInfo;
     }
 
-    /** returns the proof the Node belongs to */
+    /**
+     * returns the proof the Node belongs to
+     */
     public Proof proof() {
         return proof;
     }
@@ -225,14 +237,16 @@ public RuleApp getAppliedRuleApp() {
         return appliedRuleApp;
     }
 
-    /** Returns the set of NoPosTacletApps at this node */
+    /**
+     * Returns the set of NoPosTacletApps at this node
+     */
     public Iterable<NoPosTacletApp> getLocalIntroducedRules() {
         return localIntroducedRules;
     }
 
     /**
      * Returns the set of created program variables known in this node.
-     *
+     * <p>
      * In the resulting list, the newest additions come first.
      *
      * @returns a non-null immutable list of program variables.
@@ -249,7 +263,7 @@ public void addLocalProgVars(Iterable<? extends IProgramVariable> elements) {
 
     /**
      * Returns the set of freshly created function symbols known to this node.
-     *
+     * <p>
      * In the resulting list, the newest additions come first.
      *
      * @return a non-null immutable list of function symbols.
@@ -444,7 +458,7 @@ List<Node> getLeaves() {
 
     /**
      * @return an iterator for the leaves of the subtree below this node. The computation is called
-     *         at every call!
+     * at every call!
      */
     public Iterator<Node> leavesIterator() {
         return new NodeIterator(getLeaves().iterator());
@@ -471,13 +485,14 @@ public Iterator<Node> subtreeIterator() {
         return new SubtreeIterator(this);
     }
 
-    /** @return number of children */
+    /**
+     * @return number of children
+     */
     public int childrenCount() {
         return children.size();
     }
 
     /**
-     *
      * @param i an index (starting at 0).
      * @return the i-th child of this node.
      */
@@ -488,7 +503,7 @@ public Node child(int i) {
     /**
      * @param child a child of this node.
      * @return the number of the node <code>child</code>, if it is a child of this node (starting
-     *         with <code>0</code>), <code>-1</code> otherwise
+     * with <code>0</code>), <code>-1</code> otherwise
      */
     public int getChildNr(Node child) {
         int res = 0;
@@ -528,16 +543,16 @@ public StringBuffer getUniqueTacletId() {
      * Helper for {@link #toString()}
      *
      * @param prefix needed to keep track if a line has to be printed
-     * @param tree the tree representation we want to add this subtree " @param preEnumeration the
-     *        enumeration of the parent without the last number
+     * @param tree   the tree representation we want to add this subtree " @param preEnumeration the
+     *               enumeration of the parent without the last number
      * @param postNr the last number of the parents enumeration
-     * @param maxNr the number of nodes at this level
-     * @param ownNr the place of this node at this level
+     * @param maxNr  the number of nodes at this level
+     * @param ownNr  the place of this node at this level
      * @return the string representation of this node.
      */
 
     private StringBuffer toString(String prefix, StringBuffer tree, String preEnumeration,
-            int postNr, int maxNr, int ownNr) {
+                                  int postNr, int maxNr, int ownNr) {
         Iterator<Node> childrenIt = childrenIterator();
         // Some constants
         String frontIndent = (maxNr > 1 ? " " : "");
@@ -588,7 +603,7 @@ private StringBuffer toString(String prefix, StringBuffer tree, String preEnumer
         while (childrenIt.hasNext()) {
             childId++;
             childrenIt.next().toString(prefix, tree, newEnumeration, newPostNr, children.size(),
-                childId);
+                    childId);
         }
 
         return tree;
@@ -645,7 +660,7 @@ public String name() {
      * this node.
      *
      * @return true iff the parent of this node has this node as child and this condition holds also
-     *         for the own children.
+     * for the own children.
      */
     public boolean sanityCheckDoubleLinks() {
         if (!root()) {
@@ -667,7 +682,9 @@ public boolean sanityCheckDoubleLinks() {
         return true;
     }
 
-    /** marks a node as closed */
+    /**
+     * marks a node as closed
+     */
     Node close() {
         closed = true;
         Node tmp = parent;
@@ -684,7 +701,7 @@ Node close() {
     /**
      * Opens a previously closed node and all its closed parents.
      * <p>
-     *
+     * <p>
      * This is, for instance, needed for the {@link MergeRule}: In a situation where a merge node
      * and its associated partners have been closed and the merge node is then pruned away, the
      * partners have to be reopened again. Otherwise, we have a soundness issue.
@@ -699,7 +716,9 @@ void reopen() {
         clearNameCache();
     }
 
-    /** @return true iff this inner node is closeable */
+    /**
+     * @return true iff this inner node is closeable
+     */
     private boolean isCloseable() {
         assert childrenCount() > 0;
         for (Node child : children) {
@@ -768,7 +787,7 @@ public Iterator<Node> iterator() {
      * Retrieves a user-defined data.
      *
      * @param service the class for which the data were registered
-     * @param <T> any class
+     * @param <T>     any class
      * @return null or the previous data
      * @see #register(Object, Class)
      */
@@ -786,7 +805,7 @@ public <T> T lookup(Class<T> service) {
     /**
      * Register a user-defined data in this node info.
      *
-     * @param obj an object to be registered
+     * @param obj     an object to be registered
      * @param service the key under it should be registered
      * @param <T>
      */
@@ -797,9 +816,9 @@ public <T> void register(T obj, Class<T> service) {
     /**
      * Remove a previous registered user-defined data.
      *
-     * @param obj registered object
+     * @param obj     registered object
      * @param service the key under which the data was registered
-     * @param <T> arbitray object
+     * @param <T>     arbitray object
      */
     public <T> void deregister(T obj, Class<T> service) {
         if (userData != null) {
@@ -837,4 +856,8 @@ public int getStepIndex() {
     void setStepIndex(int stepIndex) {
         this.stepIndex = stepIndex;
     }
+
+    public Stream<Node> childrenStream() {
+        return children.stream();
+    }
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
index d7ac6c484d0..6b97d88d82d 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
@@ -11,7 +11,6 @@
 import java.util.function.Predicate;
 import javax.swing.*;
 
-import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.*;
@@ -28,7 +27,6 @@
 import de.uka.ilkd.key.proof.replay.CopyingProofReplayer;
 import de.uka.ilkd.key.rule.NoPosTacletApp;
 import de.uka.ilkd.key.rule.OneStepSimplifier;
-import de.uka.ilkd.key.rule.Rule;
 import de.uka.ilkd.key.rule.merge.MergePartner;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp;
@@ -56,7 +54,7 @@
  * information, and methods to apply rules. Furthermore, it offers services that deliver the open
  * goals, namespaces and several other information about the current state of the proof.
  */
-public class Proof implements Named, Identifiable {
+public class Proof implements Named {
 
     /**
      * The time when the {@link Proof} instance was created.
@@ -1477,12 +1475,4 @@ public void copyCachedGoals(Proof referencedFrom, Consumer<Integer> callbackTota
             }
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String identification() {
-        return getClass().getName() + "_" + name + "_" + hashCode();
-    }
 }
diff --git a/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java b/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
index 57ad2025a7e..abd24dd8d6e 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
@@ -33,7 +33,7 @@ private void loadZip(Path fileTarget) throws Exception {
     }
 
     private void proveAndSaveZip(Path file, Path fileTarget)
-            throws ProblemLoaderException, IOException {
+            throws ProblemLoaderException, InterruptedException {
         KeYEnvironment<DefaultUserInterfaceControl> env = KeYEnvironment.load(file.toFile());
         env.getProofControl().startAndWaitForAutoMode(env.getLoadedProof());
         GZipProofSaver proofSaver =
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
index 6f634c192f1..a80815bbe03 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.swing.*;
-
 import de.uka.ilkd.key.control.InteractionListener;
 import de.uka.ilkd.key.core.InterruptListener;
 import de.uka.ilkd.key.core.KeYMediator;
@@ -20,10 +16,15 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * The Class ProofMacroWorker is a swing worker for the application of proof macros.
  * <p>
@@ -39,7 +40,7 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
      * goals under the current pio, selection remains where it was.
      */
     private static final boolean SELECT_GOAL_AFTER_MACRO =
-        Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
+            Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
 
     /**
      * The {@link Node} to start macro at.
@@ -69,22 +70,26 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
     private Exception exception;
     private final List<InteractionListener> interactionListeners = new ArrayList<>();
 
+    private final Condition finish;
+
     /**
      * Instantiates a new proof macro worker.
      *
-     * @param node the {@link Node} to start macro at.
-     * @param macro the macro, not null
+     * @param node     the {@link Node} to start macro at.
+     * @param macro    the macro, not null
      * @param mediator the mediator, not null
      * @param posInOcc the position, possibly null
      */
     public ProofMacroWorker(Node node, ProofMacro macro, KeYMediator mediator,
-            PosInOccurrence posInOcc) {
+                            PosInOccurrence posInOcc) {
         assert macro != null;
         assert mediator != null;
         this.node = node;
         this.macro = macro;
         this.mediator = mediator;
         this.posInOcc = posInOcc;
+
+        finish = new ReentrantLock().newCondition();
     }
 
     @Override
@@ -93,7 +98,7 @@ protected ProofMacroFinishedInfo doInBackground() {
         Proof selectedProof = node.proof();
         info = ProofMacroFinishedInfo.getDefaultInfo(macro, selectedProof);
         ptl.taskStarted(
-            new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
+                new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
         try {
             synchronized (macro) {
                 info = macro.applyTo(mediator.getUI(), node, posInOcc, ptl);
@@ -105,6 +110,8 @@ protected ProofMacroFinishedInfo doInBackground() {
         } catch (final Exception exception) {
             // This should actually never happen.
             this.exception = exception;
+        } finally {
+            finish.signalAll();
         }
 
         return info;
@@ -120,8 +127,7 @@ protected void done() {
         synchronized (macro) {
             mediator.removeInterruptedListener(this);
             if (!isCancelled() && exception != null) { // user cancelled task is fine, we do not
-                                                       // report this
-                // This should actually never happen.
+                // report this // This should actually never happen.
                 LOGGER.error("", exception);
                 IssueDialog.showExceptionDialog(MainWindow.getInstance(), exception);
             }
@@ -138,7 +144,7 @@ protected void done() {
     }
 
     protected void emitProofMacroFinished(Node node, ProofMacro macro, PosInOccurrence posInOcc,
-            ProofMacroFinishedInfo info) {
+                                          ProofMacroFinishedInfo info) {
         interactionListeners.forEach((l) -> l.runMacro(node, macro, posInOcc, info));
     }
 
@@ -167,4 +173,11 @@ private void selectOpenGoalBelow() {
             }
         }
     }
+
+    /**
+     * @return a condition for waiting on this thread to be finished
+     */
+    public Condition getFinish() {
+        return finish;
+    }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
index 6c94d762e00..90c9398b076 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
@@ -183,6 +183,13 @@ public void done() {
         }
 
         mediator.removeInterruptedListener(this);
+        runWithDeadline(() -> mediator.startInterface(true), 1000);
+        runWithDeadline(() -> {
+            try {
+                mediator.getUI().getProofControl().stopAndWaitAutoMode();
+            } catch (InterruptedException ignored) {
+            }
+        }, 1000);
 
         final Proof proof = initiallySelectedGoal != null ? initiallySelectedGoal.proof()
                 : mediator.getSelectedProof();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index ceaba6d1bb1..2b8a53215d5 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -24,6 +24,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.awt.event.ActionEvent;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * This class provides an action for KeY UI which runs a set of specified proof files automatically.
  * The intent of this class is to have a massive test feature for the quality assurance of the KeY
@@ -73,7 +83,7 @@ public class RunAllProofsAction extends MainWindowAction {
     @NonNull
     private List<File> loadFiles() throws IOException {
         LOGGER.info("Use 'export {}=<...>' to set the input file for {}.", ENV_VARIABLE,
-            getClass().getSimpleName());
+                getClass().getSimpleName());
 
         InputStream stream;
         if (RUN_ALL_PROOFS_UI == null) {
@@ -87,7 +97,7 @@ private List<File> loadFiles() throws IOException {
         }
 
         try (BufferedReader in =
-            new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+                     new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             return in.lines().filter(it -> !it.startsWith("#") && !it.trim().isEmpty())
                     .map(it -> (it.startsWith("/") ? new File(it) : new File(exampleDir, it))
                             .getAbsoluteFile())
@@ -110,13 +120,13 @@ public RunAllProofsAction(MainWindow mainWindow) {
 
         setName("Run all proofs");
         setTooltip(
-            "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
+                "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        WindowUserInterfaceControl ui = mainWindow.getUserInterface();
 
+        WindowUserInterfaceControl ui = mainWindow.getUserInterface();
         for (int i = 0; i < files.size(); i++) {
             LOGGER.info("{}: {}\n", i, files.get(i));
         }
@@ -126,7 +136,7 @@ public void actionPerformed(ActionEvent e) {
                 ui.reportStatus(this, "Run: " + absFile);
                 LOGGER.info("Run: {}", absFile);
                 ProblemLoader problemLoader =
-                    ui.getProblemLoader(absFile, null, null, null, getMediator());
+                        ui.getProblemLoader(absFile, null, null, null, getMediator());
                 problemLoader.runSynchronously();
                 LOGGER.info("Loaded: {}", absFile);
 
@@ -135,7 +145,10 @@ public void actionPerformed(ActionEvent e) {
                 MediatorProofControl control = ui.getProofControl();
                 if (control.isAutoModeSupported(proof)) {
                     control.startAutoMode(proof, proof.openEnabledGoals());
-                    control.waitWhileAutoMode();
+                    try {
+                        control.waitWhileAutoMode();
+                    } catch (InterruptedException ignored) {
+                    }
                 }
                 LOGGER.info("Finish: ({}) {}", getMediator().getSelectedProof().closed(), absFile);
                 getMediator().getSelectedProof().dispose();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
index 89c4cb0d06b..50c05be74fa 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
@@ -172,7 +172,11 @@ public void taskFinished(TaskFinishedInfo info) {
         } else if (macroChosen()) {
             applyMacro();
         } else {
-            finish(proof);
+            try {
+                finish(proof);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -228,7 +232,7 @@ public void registerProofAggregate(ProofAggregate pa) {
         proofStack = proofStack.prepend(pa.getFirstProof());
     }
 
-    void finish(Proof proof) {
+    void finish(Proof proof) throws InterruptedException {
         // setInteractive(false) has to be called because the ruleAppIndex
         // has to be notified that we work in auto mode (CS)
         mediator.setInteractive(false);
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
index 54009075944..839de98f341 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import javax.swing.*;
 
@@ -45,6 +47,8 @@ public class MediatorProofControl extends AbstractProofControl {
     private final AbstractMediatorUserInterfaceControl ui;
     private AutoModeWorker worker;
 
+    private Condition inAutoMode;
+
     public MediatorProofControl(AbstractMediatorUserInterfaceControl ui) {
         super(ui, ui);
         this.ui = ui;
@@ -101,17 +105,14 @@ public void stopAutoMode() {
      * {@inheritDoc}
      */
     @Override
-    public void waitWhileAutoMode() {
+    public void waitWhileAutoMode() throws InterruptedException {
         if (SwingUtilities.isEventDispatchThread()) {
             LOGGER.error("", new IllegalStateException(
                 "tried to block the UI thread whilst waiting for auto mode to finish"));
             return; // do not block the UI thread
         }
-        while (ui.getMediator().isInAutoMode()) { // Wait until auto mode has stopped.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-            }
+        if (inAutoMode != null) {
+            inAutoMode.await();
         }
     }
 
@@ -138,6 +139,7 @@ public boolean isAutoModeSupported(Proof proof) {
     public void runMacro(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
         KeYMediator mediator = ui.getMediator();
         final ProofMacroWorker worker = new ProofMacroWorker(node, macro, mediator, posInOcc);
+        inAutoMode = worker.getFinish();
         interactionListeners.forEach(worker::addInteractionListener);
         mediator.initiateAutoMode(node.proof(), true, false);
         mediator.addInterruptedListener(worker);
@@ -174,6 +176,9 @@ public AutoModeWorker(final Proof proof, final ImmutableList<Goal> goals,
             if (ui.getMediator().getAutoSaver() != null) {
                 applyStrategy.addProverTaskObserver(ui.getMediator().getAutoSaver());
             }
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -185,6 +190,9 @@ protected void done() {
             } catch (final CancellationException exception) {
                 // when the user canceled it's not an error
             } finally {
+                // release threads waiting on automode finish
+                inAutoMode.signalAll();
+
                 // make it possible to free memory and falsify the isAutoMode() property
                 worker = null;
                 // Clear strategy
@@ -212,7 +220,7 @@ private void notifyException(final Throwable exception) {
         }
 
         @Override
-        protected ApplyStrategyInfo doInBackground() throws Exception {
+        protected ApplyStrategyInfo doInBackground() {
             boolean stopMode =
                 proof.getSettings().getStrategySettings().getActiveStrategyProperties()
                         .getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 248210a9f7f..fd1b8352356 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -1,27 +1,75 @@
 package org.keyproject.key.api;
 
+import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
+import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.gui.Example;
 import de.uka.ilkd.key.gui.ExampleChooser;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFacade;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommandFacade;
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.proof.Statistics;
+import de.uka.ilkd.key.macros.scripts.ProofScriptEngine;
+import de.uka.ilkd.key.macros.scripts.ScriptException;
+import de.uka.ilkd.key.parser.Location;
+import de.uka.ilkd.key.pp.IdentitySequentPrintFilter;
+import de.uka.ilkd.key.pp.LogicPrinter;
+import de.uka.ilkd.key.pp.NotationInfo;
+import de.uka.ilkd.key.pp.PosTableLayouter;
+import de.uka.ilkd.key.proof.*;
+import de.uka.ilkd.key.proof.init.*;
+import de.uka.ilkd.key.proof.io.AbstractProblemLoader;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import de.uka.ilkd.key.prover.ProverTaskListener;
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
+import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.util.KeYConstants;
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.keyproject.key.api.adapters.KeyAdapter;
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSet;
 import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.data.KeyIdentifications.*;
+import org.keyproject.key.api.internal.NodeText;
 import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.remoteclient.ClientApi;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-
-public record KeyApiImpl(KeyAdapter adapter) implements KeyApi {
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+public final class KeyApiImpl implements KeyApi {
+    private final KeyIdentifications data = new KeyIdentifications();
+
+    private ClientApi clientApi;
+    private final ProverTaskListener clientListener = new ProverTaskListener() {
+        @Override
+        public void taskStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        public void taskProgress(int position) {
+            clientApi.taskProgress(position);
+        }
+
+        @Override
+        public void taskFinished(TaskFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+    };
+    private final AtomicInteger uniqueCounter = new AtomicInteger();
+
+    public KeyApiImpl() {
+    }
 
     @Override
     @JsonRequest
@@ -49,120 +97,461 @@ public CompletableFuture<String> getVersion() {
     }
 
     @Override
-    public CompletableFuture<List<ProofMacro>> getAvailableMacros() {
+    public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                ProofMacroFacade.instance().getMacros().stream().toList()
+                ProofMacroFacade.instance().getMacros().stream()
+                        .map(ProofMacroDesc::from).toList()
         );
     }
 
     @Override
-    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+    public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                ProofScriptCommandFacade.instance().getScriptCommands().stream().toList());
+                ProofScriptCommandFacade.instance().getScriptCommands().stream().map(ProofScriptCommandDesc::from).toList());
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            var pe = new ProofScriptEngine(scriptLine, Location.UNDEFINED);
+
+            try {
+                pe.execute((AbstractUserInterfaceControl) env.getProofControl(), proof);
+                return null;
+            } catch (IOException | InterruptedException | ScriptException e) {
+                throw new RuntimeException(e);
+            }
+        });
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> macro(Proof id, String macroId, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            var macro = Objects.requireNonNull(ProofMacroFacade.instance().getMacro(macroId));
+
+            try {
+                var info = macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
+                return MacroStatistic.from(proofId, info);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> auto(Proof id, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            try {
+                env.getProofControl().startAndWaitForAutoMode(proof);
+                //clientListener);
+                return null;//MacroStatistic.from(proofId, info);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
     }
 
     @Override
-    public CompletableFuture<Boolean> dispose(Proof id) {
-        return null;
+    public CompletableFuture<Boolean> dispose(ProofId id) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(id);
+            data.dispose(id);
+            proof.dispose();
+            return true;
+        });
     }
 
     @Override
-    public CompletableFuture<NodeDesc> goals(Proof id) {
-        return null;
+    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened, boolean onlyEnabled) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            if (onlyOpened && !onlyEnabled) {
+                return asNodeDesc(proofId, proof.openGoals());
+            } else if (onlyEnabled && onlyOpened) {
+                return asNodeDesc(proofId, proof.openEnabledGoals());
+            } else {
+                return asNodeDesc(proofId, proof.allGoals());
+            }
+        });
+    }
+
+    private List<NodeDesc> asNodeDesc(ProofId proofId, ImmutableList<Goal> goals) {
+        return asNodeDesc(proofId, goals.stream().map(Goal::node));
+    }
+
+    private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
+        return nodes.map(it -> asNodeDesc(proofId, it)).toList();
+    }
+
+    private NodeDesc asNodeDesc(ProofId proofId, Node it) {
+        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(), it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
-    public CompletableFuture<NodeDesc> tree(Proof proof) {
-        return null;
+    public CompletableFuture<NodeDesc> tree(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return asNodeDescRecursive(proofId, proof.root());
+        });
+    }
+
+    private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
+        return new NodeDesc(new NodeId(proofId, root.serialNr()),
+                root.getNodeInfo().getBranchLabel(),
+                root.getNodeInfo().getScriptRuleApplication(),
+                root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList()
+        );
     }
 
     @Override
-    public CompletableFuture<NodeDesc> root(Proof proof) {
-        return null;
+    public CompletableFuture<NodeDesc> root(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return asNodeDesc(proofId, proof.root());
+        });
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId) {
-        return null;
+    public CompletableFuture<List<NodeDesc>> children(NodeId nodeId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(nodeId);
+            return asNodeDesc(nodeId.proofId(), node.childrenStream());
+        });
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId) {
+    public CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<Statistics> statistics(Proof proof) {
-        return null;
+    public CompletableFuture<Statistics> statistics(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return proof.getStatistics();
+        });
     }
 
     @Override
-    public CompletableFuture<TreeNodeDesc> treeRoot(Proof proof) {
+    public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId) {
+    public CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId) {
+    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(ProofId proof, TreeNodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<SortDesc>> sorts(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var sorts = env.getServices().getNamespaces().sorts().allElements();
+            return sorts.stream().map(SortDesc::from).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<List<Function>> functions(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<FunctionDesc>> functions(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var functions = env.getServices().getNamespaces().functions().allElements();
+            return functions.stream().map(FunctionDesc::from).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var contracts = env.getAvailableContracts();
+            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it)).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId) {
-        return null;
+    public CompletableFuture<ProofId> openContract(ContractId contractId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(contractId.envId());
+            var contracts = env.getAvailableContracts();
+            var contract = contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
+            if (contract.isPresent()) {
+                try {
+                    var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
+                    return data.register(contractId.envId(), proof);
+                } catch (ProofInputException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                return null;
+            }
+        });
     }
 
     @Override
-    public CompletableFuture<GoalText> print(Node id) {
-        return null;
+    public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(nodeId);
+            var env = data.find(nodeId.proofId().env());
+            var notInfo = new NotationInfo();
+            final var layouter = new PosTableLayouter(options.width(), options.indentation(), options.pure());
+            var lp = new LogicPrinter(notInfo, env.getServices(), layouter);
+            lp.printSequent(node.sequent());
+
+            var id = new NodeTextId(nodeId, uniqueCounter.getAndIncrement());
+            var t = new NodeText(lp.result(), layouter.getInitialPositionTable());
+            data.register(id, t);
+            return new NodeTextDesc(id, lp.result());
+        });
     }
 
+    private final IdentitySequentPrintFilter filter = new IdentitySequentPrintFilter();
+
     @Override
-    public CompletableFuture<List<TermAction>> actions(PrintId id, int pos) {
-        return null;
+    public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int pos) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(printId.nodeId());
+            var proof = data.find(printId.nodeId().proofId());
+            var goal = proof.getOpenGoal(node);
+            var nodeText = data.find(printId);
+            var pis = nodeText.table().getPosInSequent(pos, filter);
+            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis, goal)
+                    .getActions();
+        });
+
     }
 
     @Override
-    public CompletableFuture<List<TermAction>> applyAction(TermActionId id) {
+    public CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id) {
         return null;
     }
 
     @Override
-    public void freePrint(PrintId id) {
+    public void freePrint(NodeTextId printId) {
+        CompletableFuture.runAsync(() -> data.dispose(printId));
+    }
+
+    public void setClientApi(ClientApi remoteProxy) {
+        clientApi = remoteProxy;
+    }
+
+    private final DefaultUserInterfaceControl control = new MyDefaultUserInterfaceControl();
+
+    @Override
+    public CompletableFuture<ProofId> loadExample(String id) {
+        return CompletableFutures.computeAsync((c) -> {
+            var examples = ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+                    .stream().filter(it -> it.getName().equals(id)).findFirst();
+            if (examples.isPresent()) {
+                var ex = examples.get();
+                Proof proof = null;
+                KeYEnvironment<?> env = null;
+                try {
+                    var loader = control.load(JavaProfile.getDefaultProfile(),
+                            ex.getObligationFile(), null, null, null, null, true, null);
+                    InitConfig initConfig = loader.getInitConfig();
+
+                    env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                            loader.getProofScript(), loader.getResult());
+                    var envId = new EnvironmentId(env.toString());
+                    data.register(envId, env);
+                    proof = Objects.requireNonNull(env.getLoadedProof());
+                    var proofId = new ProofId(envId, proof.name().toString());
+                    return data.register(proofId, proof);
+                } catch (ProblemLoaderException e) {
+                    if (proof != null) proof.dispose();
+                    if (env != null) env.dispose();
+                    throw new RuntimeException(e);
+                }
+            }
+            throw new IllegalArgumentException("Unknown example");
+        });
+    }
+
+    @Override
+    public CompletableFuture<ProofId> loadProblem(ProblemDefinition problem) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+              /*  var loader = control.load(JavaProfile.getDefaultProfile(),
+                        ex.getObligationFile(), null, null, null, null, true, null);
+                InitConfig initConfig = loader.getInitConfig();
+
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                proof = Objects.requireNonNull(env.getLoadedProof());
+                var proofId = new ProofId(envId, proof.name().toString());
+                return data.register(proofId, proof);*/
+            return null;
+        });
 
     }
+
+    @Override
+    public CompletableFuture<ProofId> loadKey(String content) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+            try {
+                final var tempFile = File.createTempFile("json-rpc-", ".key");
+                Files.writeString(tempFile.toPath(), content);
+                var loader = control.load(JavaProfile.getDefaultProfile(),
+                        tempFile, null, null, null, null, true, null);
+                InitConfig initConfig = loader.getInitConfig();
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                proof = Objects.requireNonNull(env.getLoadedProof());
+                var proofId = new ProofId(envId, proof.name().toString());
+                return data.register(proofId, proof);
+            } catch (ProblemLoaderException | IOException e) {
+                if (proof != null) proof.dispose();
+                if (env != null) env.dispose();
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<ProofId> loadTerm(String term) {
+        return loadKey("\\problem{ " + term + " }");
+    }
+
+    @Override
+    public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+            try {
+                var loader = control.load(JavaProfile.getDefaultProfile(),
+                        params.keyFile(),
+                        params.classPath(),
+                        params.bootClassPath(),
+                        params.includes(),
+                        null,
+                        true,
+                        null);
+                InitConfig initConfig = loader.getInitConfig();
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                if ((proof = env.getLoadedProof()) != null) {
+                    var proofId = new ProofId(envId, proof.name().toString());
+                    return Either.forRight(data.register(proofId, proof));
+                } else {
+                    return Either.forLeft(envId);
+                }
+            } catch (ProblemLoaderException e) {
+                if (proof != null) proof.dispose();
+                if (env != null) env.dispose();
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    private class MyDefaultUserInterfaceControl extends DefaultUserInterfaceControl {
+        @Override
+        public void taskStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        public void taskProgress(int position) {
+            clientApi.taskProgress(position);
+        }
+
+        @Override
+        public void taskFinished(TaskFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+
+        @Override
+        protected void macroStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        protected synchronized void macroFinished(ProofMacroFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+
+        @Override
+        public void loadingStarted(AbstractProblemLoader loader) {
+            super.loadingStarted(loader);
+        }
+
+        @Override
+        public void loadingFinished(AbstractProblemLoader loader, IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList, AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
+            super.loadingFinished(loader, poContainer, proofList, result);
+        }
+
+        @Override
+        public void progressStarted(Object sender) {
+            super.progressStarted(sender);
+        }
+
+        @Override
+        public void progressStopped(Object sender) {
+            super.progressStopped(sender);
+        }
+
+        @Override
+        public void reportStatus(Object sender, String status, int progress) {
+            super.reportStatus(sender, status, progress);
+        }
+
+        @Override
+        public void reportStatus(Object sender, String status) {
+            super.reportStatus(sender, status);
+        }
+
+        @Override
+        public void resetStatus(Object sender) {
+            super.resetStatus(sender);
+        }
+
+        @Override
+        public void reportException(Object sender, ProofOblInput input, Exception e) {
+            super.reportException(sender, input, e);
+        }
+
+        @Override
+        public void setProgress(int progress) {
+            super.setProgress(progress);
+        }
+
+        @Override
+        public void setMaximum(int maximum) {
+            super.setMaximum(maximum);
+        }
+
+        @Override
+        public void reportWarnings(ImmutableSet<PositionedString> warnings) {
+            super.reportWarnings(warnings);
+        }
+
+        @Override
+        public void showIssueDialog(Collection<PositionedString> issues) {
+            super.showIssueDialog(issues);
+        }
+    }
+
+
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
new file mode 100644
index 00000000000..0a27c633e5a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextDesc(NodeTextId id, String result)  {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
new file mode 100644
index 00000000000..a99bed5fda9
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api;
+
+import org.keyproject.key.api.data.KeyIdentifications.NodeId;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextId(NodeId nodeId, int nodeTextId) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 408cc36acdd..b95ae6eebe2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -115,6 +115,8 @@ public void run() {
         }
 
         try {
+            final var keyApi = new KeyApiImpl();
+
             if (websocket) {
                 var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
                         .setOutput(out)
@@ -122,14 +124,18 @@ public void run() {
                         .traceMessages(new PrintWriter(System.err))
                         .validateMessages(true);
                 launcherBuilder.configureGson(StartServer::configureJson);
-                launcherBuilder.setLocalService(new KeyApiImpl(adapter));
+                launcherBuilder.setLocalService(keyApi);
                 launcherBuilder.setRemoteInterface(ClientApi.class);
-                launcherBuilder.create().startListening().get();
+
+                final var clientApiLauncher = launcherBuilder.create();
+                keyApi.setClientApi(clientApiLauncher.getRemoteProxy());
+                clientApiLauncher.startListening().get();
             } else {
                 establishStreams();
                 try (var lin = in; var lout = out) {
-                    var listener = launch(lout, lin);
+                    var listener = launch(lout, lin, keyApi);
                     LOGGER.info("JSON-RPC is listening for requests");
+                    keyApi.setClientApi(listener.getRemoteProxy());
                     listener.startListening().get();
                 }
             }
@@ -143,7 +149,7 @@ public static void configureJson(GsonBuilder gsonBuilder) {
         adapter = new KeyAdapter(gsonBuilder);
     }
 
-    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
         // var localServices = getLocalServices();
         // var remoteInterfaces = getRemoteInterfaces();
         var launcherBuilder = new Launcher.Builder<ClientApi>()
@@ -154,7 +160,7 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
 
         launcherBuilder.configureGson(StartServer::configureJson);
         //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl(adapter));
+        launcherBuilder.setLocalService(keyApi);
         //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
new file mode 100644
index 00000000000..51e0053eed6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -0,0 +1,125 @@
+package org.keyproject.key.api;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.control.ProofControl;
+import de.uka.ilkd.key.logic.Name;
+import de.uka.ilkd.key.logic.PosInOccurrence;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.pp.PosInSequent;
+import de.uka.ilkd.key.proof.Goal;
+import de.uka.ilkd.key.rule.*;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSLList;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.TermActionDesc;
+import org.keyproject.key.api.data.TermActionKind;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class TermActionUtil {
+    private static final Set<Name> CLUTTER_RULESETS =
+            Set.of(new Name("notHumanReadable"),
+                    new Name("obsolete"),
+                    new Name("pullOutQuantifierAll"),
+                    new Name("pullOutQuantifierEx"));
+    private static final Set<Name> CLUTTER_RULES = Set.of(
+            new Name("cut_direct_r"),
+            new Name("cut_direct_l"),
+            new Name("case_distinction_r"),
+            new Name("case_distinction_l"),
+            new Name("local_cut"),
+            new Name("commute_and_2"),
+            new Name("commute_or_2"),
+            new Name("boxToDiamond"),
+            new Name("pullOut"),
+            new Name("typeStatic"),
+            new Name("less_is_total"),
+            new Name("less_zero_is_total"),
+            new Name("applyEqReverse"),
+
+            // the following are used for drag'n'drop interactions
+            new Name("eqTermCut"),
+            new Name("instAll"),
+            new Name("instEx")
+    );
+    private static final Set<String> FILTER_SCRIPT_COMMANDS = Set.of(
+            "exit",
+            "leave",
+            "javascript",
+            "skip",
+            "macro",
+            "rule",
+            "script");
+
+    private final PosInSequent pos;
+    private final Goal goal;
+    private final PosInOccurrence occ;
+
+    private final List<TermActionDesc> actions = new ArrayList<>(1024);
+    private final NodeTextId nodeTextId;
+
+    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env, @NonNull PosInSequent pos, @NonNull Goal goal) {
+        this.pos = pos;
+        this.goal = goal;
+        this.nodeTextId = nodeTextId;
+        occ = pos.getPosInOccurrence();
+        ProofControl c = env.getUi().getProofControl();
+        final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
+        for (ProofMacro macro : ProofMacroFacade.instance().getMacros()) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "macro:" + macro.getScriptCommandName());
+            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(), macro.getCategory(), TermActionKind.Macro);
+            add(ta);
+        }
+        ImmutableList<TacletApp> findTaclet = c.getFindTaclet(goal, occ);
+        var find = removeRewrites(findTaclet)
+                .prepend(c.getRewriteTaclet(goal, occ));
+        var nofind = c.getNoFindTaclet(goal);
+
+
+        for (TacletApp tacletApp : find) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "find:" + tacletApp.rule());
+            TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
+                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+            add(ta);
+        }
+
+        for (TacletApp tacletApp : nofind) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "nofind:" + tacletApp.rule());
+            TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
+                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+            add(ta);
+        }
+    }
+
+    private void add(TermActionDesc ta) {
+        actions.add(ta);
+    }
+
+    /**
+     * Removes RewriteTaclet from the list.
+     *
+     * @param list the IList<Taclet> from where the RewriteTaclet are removed
+     * @return list without RewriteTaclets
+     */
+    private static ImmutableList<TacletApp> removeRewrites(
+            ImmutableList<TacletApp> list) {
+        ImmutableList<TacletApp> result = ImmutableSLList.nil();
+        for (TacletApp tacletApp : list) {
+            Taclet taclet = tacletApp.taclet();
+            result = (taclet instanceof RewriteTaclet ? result : result.prepend(tacletApp));
+        }
+        return result;
+    }
+
+    public List<TermActionDesc> getActions() {
+        return actions;
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 9168a2128f5..68b330491fc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -1,20 +1,14 @@
 package org.keyproject.key.api.adapters;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.logic.op.Function;
 import de.uka.ilkd.key.macros.ProofMacro;
-import de.uka.ilkd.key.macros.ProofMacroFacade;
-import de.uka.ilkd.key.proof.Proof;
 import org.keyproject.key.api.data.MacroDescription;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Type;
 
 /**
@@ -22,40 +16,39 @@
  * @version 1 (14.10.23)
  */
 public class KeyAdapter {
-    private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    //private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
     //private final TypeAdapter<Object> adaptor;
 
     public KeyAdapter(GsonBuilder gson) {
         gson.registerTypeAdapter(File.class, new FileTypeAdapter());
-        gson.registerTypeAdapter(Function.class, new FunctionTypeAdapter());
-        gson.registerTypeAdapter(Proof.class, new IdentifiableTypeAdapter());
-        gson.registerTypeAdapter(ProofMacro.class, new MacroTypeAdapter());
-        //adaptor = gson.create().getAdapter(Object.class);
+        //gson.registerTypeAdapter(Function.class, new FunctionSerializer());
+        //gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
     }
 
 
+    /*
     //translating entities to identification strings
-    public String insert(Identifiable p) {
+    public void insert(Identifiable p) {
         var id = p.identification();
         if (!map.containsKey(id)) {
             map.put(id, new WeakReference<>(p));
         }
-        return id;
     }
 
     public Object find(String id) {
         return map.get(id).get();
     }
     //endregion
+    */
 
-    class MacroTypeAdapter implements JsonSerializer<ProofMacro> {
+    static class MacroSerializer implements JsonSerializer<ProofMacro> {
         @Override
         public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
             return context.serialize(MacroDescription.from(src));
         }
     }
 
-    class FileTypeAdapter extends TypeAdapter<File> {
+    static class FileTypeAdapter extends TypeAdapter<File> {
         @Override
         public void write(JsonWriter out, File value) throws IOException {
             out.value(value.toString());
@@ -67,7 +60,7 @@ public File read(JsonReader in) throws IOException {
         }
     }
 
-    class FunctionTypeAdapter implements JsonSerializer<Function> {
+    static class FunctionSerializer implements JsonSerializer<Function> {
         @Override
         public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
             var obj = new JsonObject();
@@ -81,7 +74,7 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
         }
     }
 
-    class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
+    /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
         @Override
         public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
             return (Identifiable) find(json.getAsString());
@@ -92,5 +85,5 @@ public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerialization
             insert(src);
             return context.serialize(src.identification());
         }
-    }
+    }*/
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index a81f8d863db..531bc2fb56d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -1,8 +1,17 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.speclang.Contract;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record ContractDesc() {
+public record ContractDesc(KeyIdentifications.ContractId contractId, String name, String displayName,
+                           String typeName, String htmlText, String plainText) {
+    public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services, Contract it) {
+        return new ContractDesc(new KeyIdentifications.ContractId(envId, it.id()),
+                it.getName(), it.getDisplayName(), it.getTypeName(),
+                it.getHTMLText(services), it.getPlainText(services));
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 0c612b44cc2..1868871c0e3 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -1,10 +1,21 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.logic.op.Function;
+
 import java.util.List;
 
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record FunctionDesc(String name, String sort, List<String> sorts) {
+public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts, boolean rigid,
+                           boolean unique, boolean skolemConstant) {
+    public static FunctionDesc from(Function fn) {
+        return new FunctionDesc(fn.name().toString(), fn.proofToString(),
+                SortDesc.from(fn.sort()),
+                fn.argSorts().stream().map(SortDesc::from).toList(),
+                fn.isRigid(),
+                fn.isUnique(),
+                fn.isSkolemConstant());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
deleted file mode 100644
index 7a0e2f264e0..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.keyproject.key.api.data;
-
-import de.uka.ilkd.key.pp.PositionTable;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record GoalText(PrintId id, String text, PositionTable table) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
new file mode 100644
index 00000000000..0698a50a982
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -0,0 +1,163 @@
+package org.keyproject.key.api.data;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.internal.NodeText;
+
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class KeyIdentifications {
+    private final BiMap<EnvironmentId, KeyEnvironmentContainer> mapEnv = HashBiMap.create(16);
+
+    public KeyEnvironmentContainer getContainer(EnvironmentId environmentId) {
+        return Objects.requireNonNull(mapEnv.get(environmentId), "Could not find environment for id" + environmentId);
+    }
+
+    public ProofContainer getContainer(ProofId proofId) {
+        return Objects.requireNonNull(getContainer(proofId.env()).mapProof.get(proofId),
+                "Could not find proof for id" + proofId);
+    }
+
+    public KeYEnvironment<?> find(EnvironmentId envid) {
+        return Objects.requireNonNull(getContainer(envid).env.get(), "Environment was removed by gc");
+    }
+
+    @NonNull
+    public Proof find(ProofId proofId) {
+        return Objects.requireNonNull(getContainer(proofId).wProof.get(), "Could not find a proof for id " + proofId);
+    }
+
+    @NonNull
+    public NodeText find(NodeTextId nodeTextId) {
+        return Objects.requireNonNull(getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
+                "Could not find a print-out with the id " + nodeTextId);
+    }
+
+    public void dispose(NodeTextId nodeTextId) {
+        var c = getContainer(nodeTextId.nodeId().proofId());
+        c.mapGoalText.remove(nodeTextId);
+    }
+
+    public void dispose(ProofId id) {
+        var c = getContainer(id);
+        getContainer(id.env).mapProof.remove(id);
+        c.dispose();
+    }
+
+    public Node find(NodeId nodeId) {
+        @NonNull Proof p = find(nodeId.proofId);
+        var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
+        return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
+    }
+
+    public ProofId register(EnvironmentId envId, Proof proof) {
+        var id = new ProofId(envId, proof.name().toString());
+        getContainer(envId).mapProof.put(id, new ProofContainer(proof));
+        return id;
+    }
+
+    public void register(NodeTextId nodeId, NodeText nodeText) {
+        var c = getContainer(nodeId.nodeId().proofId());
+        c.mapGoalText().put(nodeId, nodeText);
+
+    }
+
+    public EnvironmentId register(EnvironmentId envId, KeYEnvironment<?> env) {
+        mapEnv.put(envId, new KeyEnvironmentContainer(env));
+        return envId;
+    }
+
+    public ProofId register(ProofId proofId, Proof proof) {
+        getContainer(proofId.env()).mapProof.put(proofId, new ProofContainer(proof));
+        return proofId;
+    }
+
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record EnvironmentId(String envId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record ContractId(EnvironmentId envId, int contractId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (29.10.23)
+     */
+    public record NodeId(ProofId proofId, int nodeId) {
+    }
+
+    public record ProofId(EnvironmentId env, String proofId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record PrintId(String id) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record TermActionId(NodeId nodeId, String pio, String id) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record TreeNodeId(String id) {
+    }
+
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record KeyEnvironmentContainer(WeakReference<KeYEnvironment<?>> env,
+                                          BiMap<ProofId, ProofContainer> mapProof
+    ) {
+
+        public KeyEnvironmentContainer(KeYEnvironment<?> env) {
+            this(new WeakReference<>(env), HashBiMap.create(1));
+        }
+
+        void dispose() {
+            env.clear();
+            mapProof.clear();
+        }
+    }
+
+    private record ProofContainer(WeakReference<Proof> wProof,
+                                  BiMap<NodeId, WeakReference<Node>> mapNode,
+                                  BiMap<TreeNodeId, WeakReference<TreeNodeDesc>> mapTreeNode,
+                                  BiMap<NodeTextId, NodeText> mapGoalText
+    ) {
+        public ProofContainer(Proof proof) {
+            this(new WeakReference<>(proof), HashBiMap.create(16), HashBiMap.create(16), HashBiMap.create(16));
+        }
+
+        void dispose() {
+            mapNode.clear();
+        }
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index 74c2d9d1cc4..b0c2397d1f3 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -1,8 +1,15 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record MacroStatistic() {
+public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, boolean cancelled, int appliedRules,
+                             int closedGoals) {
+    public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
+        return new MacroStatistic(proofId, info.getMacro().getName(), info.isCancelled(),
+                info.getAppliedRules(), info.getClosedGoals());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index 9bc8ad0cd04..9e24e0f4cd7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,8 +1,18 @@
 package org.keyproject.key.api.data;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.List;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record NodeDesc() {
+public record NodeDesc(KeyIdentifications.NodeId nodeid, String branchLabel,
+                       boolean scriptRuleApplication,
+                       @Nullable List<NodeDesc> children
+) {
+    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication) {
+        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null);
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
deleted file mode 100644
index 3d4893d43e4..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.data;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record PrintId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
new file mode 100644
index 00000000000..31981c61beb
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.macros.ProofMacro;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ProofMacroDesc(String name, String category, String description, String scriptCommandName) {
+    public static ProofMacroDesc from(ProofMacro proofMacro) {
+        return new ProofMacroDesc(proofMacro.getName(), proofMacro.getCategory(),
+                proofMacro.getDescription(), proofMacro.getScriptCommandName());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
new file mode 100644
index 00000000000..f6eef733d08
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -0,0 +1,13 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ProofScriptCommandDesc() {
+    public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
+        return null;
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index b582b4a73f5..66df02ee6b0 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -1,8 +1,19 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.logic.sort.Sort;
+
+import java.util.List;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record SortDesc() {
+public record SortDesc(String string, String documentation,
+                       List<SortDesc> extendsSorts,
+                       boolean anAbstract, String s) {
+    public static SortDesc from(Sort sort) {
+        return new SortDesc(sort.name().toString(), sort.getDocumentation(),
+                sort.extendsSorts().stream().map(SortDesc::from).toList(),
+                sort.isAbstract(), sort.declarationString());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
deleted file mode 100644
index b69046120f5..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.data;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TermAction(TermActionId commandId, String displayName) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
new file mode 100644
index 00000000000..b27ac08a279
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -0,0 +1,11 @@
+package org.keyproject.key.api.data;
+
+import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermActionDesc(TermActionId commandId, String displayName, String description, String category,
+                             TermActionKind kind) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
index 7951c776af4..96d22acee47 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
@@ -1,8 +1,2 @@
 package org.keyproject.key.api.data;
 
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TermActionId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
new file mode 100644
index 00000000000..cc7d9aec71a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public enum TermActionKind {
+    BuiltIn, Script, Macro, Taclet
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
index 3dba5cc492e..96d22acee47 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
@@ -1,8 +1,2 @@
 package org.keyproject.key.api.data;
 
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TreeNodeId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
new file mode 100644
index 00000000000..5750fea944d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
@@ -0,0 +1,12 @@
+package org.keyproject.key.api.internal;
+
+import de.uka.ilkd.key.pp.InitialPositionTable;
+import de.uka.ilkd.key.pp.PositionTable;
+import de.uka.ilkd.key.proof.Node;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record NodeText(String text, InitialPositionTable table) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index e82ca44ae28..e84a0152760 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -1,11 +1,10 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.ContractDesc;
+import org.keyproject.key.api.data.FunctionDesc;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.SortDesc;
 
 import java.util.List;
@@ -18,14 +17,14 @@
 @JsonSegment("env")
 public interface EnvApi {
     @JsonRequest
-    CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env);
+    CompletableFuture<List<SortDesc>> sorts(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<List<Function>> functions(KeYEnvironment<?> env);
+    CompletableFuture<List<FunctionDesc>> functions(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env);
+    CompletableFuture<List<ContractDesc>> contracts(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId);
+    CompletableFuture<ProofId> openContract(ContractId contractId);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index fe678b8f04e..2f34293f0d5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -1,13 +1,12 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Node;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.GoalText;
-import org.keyproject.key.api.data.PrintId;
-import org.keyproject.key.api.data.TermAction;
-import org.keyproject.key.api.data.TermActionId;
+import org.keyproject.key.api.NodeTextDesc;
+import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -19,14 +18,14 @@
 @JsonSegment("goal")
 public interface GoalApi {
     @JsonRequest
-    CompletableFuture<GoalText> print(Node id);
+    CompletableFuture<NodeTextDesc> print(NodeId id, PrintOptions options);
 
     @JsonRequest
-    CompletableFuture<List<TermAction>> actions(PrintId id, int pos);
+    CompletableFuture<List<TermActionDesc>> actions(NodeTextId id, int pos);
 
     @JsonRequest("apply_action")
-    CompletableFuture<List<TermAction>> applyAction(TermActionId id);
+    CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id);
 
     @JsonNotification("free")
-    void freePrint(PrintId id);
+    void freePrint(NodeTextId id);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index ac650359a74..56a166f9af7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -3,5 +3,5 @@
 /**
  * The combined interface that is provided by KeY.
  */
-public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi {
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi, ProofLoadApi{
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index a4a16b66b02..f101a47f16a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,12 +1,13 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.macros.ProofMacro;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.ProofMacroDesc;
+import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 
 @JsonSegment("meta")
 public interface MetaApi {
@@ -14,8 +15,8 @@ public interface MetaApi {
     CompletableFuture<String> getVersion();
 
     @JsonRequest("available_macros")
-    CompletableFuture<List<ProofMacro>> getAvailableMacros();
+    CompletableFuture<List<ProofMacroDesc>> getAvailableMacros();
 
     @JsonRequest("available_script_commands")
-    CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
+    CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
new file mode 100644
index 00000000000..6555b2a16fb
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.remoteapi;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record PrintOptions(boolean unicode, int width, int indentation, boolean pure,
+                           boolean termLabels) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index 16c9f390b89..e496b7a4d38 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -1,9 +1,8 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.Statistics;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
 import org.keyproject.key.api.data.StreategyOptions;
@@ -17,32 +16,32 @@
  */
 public interface ProofApi {
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options);
+    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> macro(Proof proof, String macroId, StreategyOptions options);
+    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> auto(Proof proof, StreategyOptions options);
+    CompletableFuture<MacroStatistic> auto(ProofId proof, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<Boolean> dispose(Proof proof);
+    CompletableFuture<Boolean> dispose(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> goals(Proof proof);
+    CompletableFuture<List<NodeDesc>> goals(ProofId proof, boolean onlyOpened, boolean onlyEnabled);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> tree(Proof proof);
+    CompletableFuture<NodeDesc> tree(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> root(Proof proof);
+    CompletableFuture<NodeDesc> root(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId);
+    CompletableFuture<List<NodeDesc>> children(NodeId nodeId);
 
     @JsonRequest
-    CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId);
+    CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId);
 
     @JsonRequest
-    CompletableFuture<Statistics> statistics(Proof proof);
+    CompletableFuture<Statistics> statistics(ProofId proof);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
similarity index 50%
rename from keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 14d737fd5d6..9ffedadf57d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -1,10 +1,16 @@
-package org.keyproject.key.api.data;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.KeyIdentifications.EnvironmentId;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
+import org.keyproject.key.api.data.LoadParams;
+import org.keyproject.key.api.data.ProblemDefinition;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -15,20 +21,29 @@
  * @since v1
  */
 @JsonSegment("loading")
-public interface ProofLoading {
+public interface ProofLoadApi {
     /**
      * I am not sure whether this is helpful. Mainly a feature for testing?!
      * @param id
      * @return
      */
     @JsonRequest
-    CompletableFuture<Proof> loadExample(String id);
+    CompletableFuture<ProofId> loadExample(String id);
 
     /**
      *
      */
     @JsonRequest
-    CompletableFuture<Proof> loadProblem(ProblemDefinition problem);
+    CompletableFuture<ProofId> loadProblem(ProblemDefinition problem);
+
+    /**
+     *
+     */
+    @JsonRequest
+    CompletableFuture<ProofId> loadKey(String content);
+
+    @JsonRequest
+    CompletableFuture<ProofId> loadTerm(String term);
 
     /**
      * Test!
@@ -38,5 +53,5 @@ public interface ProofLoading {
      * @throws ProblemLoaderException if something went wrong
      */
     @JsonRequest
-    CompletableFuture<KeYEnvironment<?>> load(LoadParams params) throws ProblemLoaderException;
+    CompletableFuture<Either<EnvironmentId,ProofId>> load(LoadParams params) throws ProblemLoaderException;
 }
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index 88f5cad0330..d3225919d63 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -1,10 +1,10 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
+import org.keyproject.key.api.data.KeyIdentifications.TreeNodeId;
 import org.keyproject.key.api.data.TreeNodeDesc;
-import org.keyproject.key.api.data.TreeNodeId;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -16,11 +16,11 @@
 @JsonSegment("proofTree")
 public interface ProofTreeApi {
     @JsonRequest("root")
-    CompletableFuture<TreeNodeDesc> treeRoot(Proof id);
+    CompletableFuture<TreeNodeDesc> treeRoot(ProofId id);
 
     @JsonRequest("children")
-    CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId);
+    CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId);
 
     @JsonRequest("subtree")
-    CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId);
+    CompletableFuture<List<TreeNodeDesc>> treeSubtree(ProofId proof, TreeNodeId nodeId);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index a7aebdca1bf..ca086eae72f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api.remoteclient;
 
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
@@ -61,5 +63,10 @@ public interface ClientApi {
      */
     @JsonRequest
     CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
+
+
+    void taskFinished(TaskFinishedInfo info);
+    void taskProgress(int position);
+    void taskStarted(TaskStartedInfo info);
     //endregion
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 1b63674ce67..b275265b6c7 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api;
 
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
 import org.keyproject.key.api.remoteclient.*;
 
 import javax.annotation.Nullable;
@@ -32,4 +34,19 @@ public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParam
     public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params) {
         return null;
     }
+
+    @Override
+    public void taskFinished(TaskFinishedInfo info) {
+        System.out.println(info);
+    }
+
+    @Override
+    public void taskProgress(int position) {
+
+    }
+
+    @Override
+    public void taskStarted(TaskStartedInfo info) {
+        System.out.println(info);
+    }
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index edbe4aee393..ae34b339231 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -24,7 +25,7 @@ public class TestRpc {
     private KeyApi keyApi;
 
     @BeforeEach
-    void setup() throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    void setup() throws IOException {
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
         PipedInputStream inServer = new PipedInputStream();
@@ -33,7 +34,9 @@ void setup() throws IOException, ExecutionException, InterruptedException, Timeo
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer);
+        KeyApiImpl impl = new KeyApiImpl(new KeyAdapter(null));
+        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer, impl);
+        impl.setClientApi(serverLauncher.getRemoteProxy());
 
         var client = new SimpleClient();
         Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
diff --git a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
index 8b8f69d3bf3..5d7647eaf34 100644
--- a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
+++ b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.exploration;
 
-import java.io.File;
-
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.logic.*;
 import de.uka.ilkd.key.nparser.KeyIO;
@@ -12,13 +10,13 @@
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-
-import org.key_project.util.collection.ImmutableList;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.key_project.util.collection.ImmutableList;
+
+import java.io.File;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -85,7 +83,7 @@ public void testAdditionAntec() {
 
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-            "Parent is marked as ExplorationNode and data contains Exploration Action");
+                "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -127,7 +125,7 @@ public void testAdditionSucc() {
         testAddition(withAddedTerm, justification, added, false);
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-            "Parent is marked as ExplorationNode and data contains Exploration Action");
+                "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -148,9 +146,9 @@ public void testChangeFormula() {
         assertSame(1, goals.size(), "Prerequisite for test");
         Sequent sequent = goals.head().node().sequent();
         PosInOccurrence pio =
-            new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
+                new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
         expService.applyChangeFormula(goals.head(), pio, sequent.succedent().get(0).formula(),
-            change);
+                change);
         ImmutableList<Goal> newCreatedGoals = currentProof.openGoals();
 
         assertEquals(2, newCreatedGoals.size(), "Two new goals created");
@@ -168,13 +166,16 @@ public void testChangeFormula() {
         assertNotNull(justificationBranch.node().lookup(ExplorationNodeData.class));
 
         assertEquals(new Name("hide_right"), hideNode.getAppliedRuleApp().rule().name(),
-            "Hide Right was applied");
+                "Hide Right was applied");
         // set all goals to interactive
         justificationBranch.setEnabled(true);
         // perform proof, it has to close
-        env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
-        assertTrue(currentProof.closed(), "Proof is closed");
-
+        try {
+            env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
+            assertTrue(currentProof.closed(), "Proof is closed");
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -183,34 +184,34 @@ public void testChangeFormula() {
      */
     private void testAddition(Goal withAddedTerm, Goal justification, Term added, boolean antec) {
         Semisequent semiSeqAdded =
-            antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+                antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
         Semisequent parentSemiSeqOfAdded =
-            antec ? withAddedTerm.node().parent().sequent().antecedent()
-                    : withAddedTerm.node().parent().sequent().succedent();
+                antec ? withAddedTerm.node().parent().sequent().antecedent()
+                        : withAddedTerm.node().parent().sequent().succedent();
 
         Semisequent semiSeqUntouched =
-            !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+                !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
 
         Semisequent parentSemiSeqOfUntouched =
-            !antec ? withAddedTerm.node().parent().sequent().antecedent()
-                    : withAddedTerm.node().parent().sequent().succedent();
+                !antec ? withAddedTerm.node().parent().sequent().antecedent()
+                        : withAddedTerm.node().parent().sequent().succedent();
 
 
         assertSame(semiSeqAdded.size(), parentSemiSeqOfAdded.size() + 1,
-            "The size of the added semisequent has changed");
+                "The size of the added semisequent has changed");
         assertEquals(semiSeqAdded.get(0).formula(), added, "Added Term is indeed added");
         assertFalse(justification.isAutomatic(), "Justification branch is marked as interactive");
 
         assertSame(semiSeqUntouched.size(), parentSemiSeqOfUntouched.size(),
-            "The size if untouched semisequents is the same");
+                "The size if untouched semisequents is the same");
         assertEquals(semiSeqUntouched, parentSemiSeqOfUntouched,
-            "The  untouched semisequents are equal");
+                "The  untouched semisequents are equal");
 
         Node parent = withAddedTerm.node().parent();
 
         assertEquals(parent, justification.node().parent(), "Both nodes have the same parent");
         assertEquals(new Name("cut"), parent.getAppliedRuleApp().rule().name(),
-            "The addition was inserted using the cut rule");
+                "The addition was inserted using the cut rule");
     }
 
     /**

From e76f27be403d489cfe5d48e78c766eb3b9adb8b2 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 29 Oct 2023 22:44:19 +0100
Subject: [PATCH 06/50] more doc and py generation

---
 api.meta.json                                 | 1144 +++++++++++++++++
 api.meta.md                                   |  480 +++++++
 api.py                                        |  374 ++++++
 .../main/java/de/uka/ilkd/key/proof/Node.java |    1 +
 keyext.api.doc/build.gradle                   |    1 +
 keyext.api.doc/src/main/java/DocGen.java      |  189 +++
 .../src/main/java/ExtractMetaData.java        |  343 +++--
 keyext.api.doc/src/main/java/Metamodel.java   |   93 ++
 keyext.api.doc/src/main/java/PyGen.java       |  136 ++
 keyext.api/build.gradle                       |    6 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |   17 +-
 .../org/keyproject/key/api/NodeTextDesc.java  |    8 -
 .../org/keyproject/key/api/NodeTextId.java    |    6 -
 .../keyproject/key/api/TermActionUtil.java    |    3 +-
 .../key/api/data/KeyIdentifications.java      |    8 +-
 .../org/keyproject/key/api/data/NodeDesc.java |    5 +-
 .../keyproject/key/api/data/NodeTextDesc.java |    9 +
 .../key/api/data/ProblemDefinition.java       |    3 +-
 .../keyproject/key/api/data/TermActionId.java |    2 -
 .../keyproject/key/api/data/TreeNodeId.java   |    2 -
 .../key/api/remoteapi/ExampleApi.java         |    2 +-
 .../key/api/remoteapi/ExampleDesc.java        |   13 +
 .../keyproject/key/api/remoteapi/GoalApi.java |    3 +-
 .../key/api/remoteapi/ServerManagement.java   |    2 +-
 keyext.api/src/main/python/keyapi/rpc.py      |   76 --
 .../java/org/keyproject/key/api/TestRpc.java  |    6 +-
 .../keyapi/__init__.py                        |   11 +-
 keyext.client.python/keyapi/rpc.py            |  200 +++
 .../python => keyext.client.python}/main.py   |    0
 keyext.client.python/rwtest.py                |  402 ++++++
 30 files changed, 3302 insertions(+), 243 deletions(-)
 create mode 100644 api.meta.json
 create mode 100644 api.meta.md
 create mode 100644 api.py
 create mode 100644 keyext.api.doc/src/main/java/DocGen.java
 create mode 100644 keyext.api.doc/src/main/java/Metamodel.java
 create mode 100644 keyext.api.doc/src/main/java/PyGen.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
 delete mode 100644 keyext.api/src/main/python/keyapi/rpc.py
 rename {keyext.api/src/main/python => keyext.client.python}/keyapi/__init__.py (54%)
 create mode 100644 keyext.client.python/keyapi/rpc.py
 rename {keyext.api/src/main/python => keyext.client.python}/main.py (100%)
 create mode 100644 keyext.client.python/rwtest.py

diff --git a/api.meta.json b/api.meta.json
new file mode 100644
index 00000000000..180b16a3019
--- /dev/null
+++ b/api.meta.json
@@ -0,0 +1,1144 @@
+{
+  "endpoints": [
+    {
+      "name": "examples/list",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ExampleDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "meta/version",
+      "documentation": "",
+      "args": [],
+      "returnType": "STRING"
+    },
+    {
+      "name": "meta/available_script_commands",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ProofScriptCommandDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "meta/available_macros",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ProofMacroDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "scriptCommandName",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "server/exit",
+      "documentation": "",
+      "args": []
+    },
+    {
+      "name": "server/shutdown",
+      "documentation": "",
+      "args": [],
+      "returnType": "BOOL"
+    },
+    {
+      "name": "server/setTrace",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "SetTraceParams"
+        }
+      ]
+    },
+    {
+      "name": "proofTree/root",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        }
+      ],
+      "returnType": {
+        "typeName": "TreeNodeDesc",
+        "fields": [],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "proofTree/children",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        },
+        {
+          "name": "arg1",
+          "type": "TreeNodeId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TreeNodeDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "proofTree/subtree",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        },
+        {
+          "name": "arg1",
+          "type": "TreeNodeId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TreeNodeDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/print",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeId"
+        },
+        {
+          "name": "arg1",
+          "type": "PrintOptions"
+        }
+      ],
+      "returnType": {
+        "typeName": "NodeTextDesc",
+        "fields": [
+          {
+            "name": "id",
+            "type": "NodeTextId"
+          },
+          {
+            "name": "result",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/actions",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeTextId"
+        },
+        {
+          "name": "arg1",
+          "type": "INT"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TermActionDesc",
+          "fields": [
+            {
+              "name": "commandId",
+              "type": "TermActionId"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "kind",
+              "type": "TermActionKind"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/apply_action",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "TermActionId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TermActionDesc",
+          "fields": [
+            {
+              "name": "commandId",
+              "type": "TermActionId"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "kind",
+              "type": "TermActionKind"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/free",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeTextId"
+        }
+      ]
+    },
+    {
+      "name": "env/functions",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "FunctionDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "sort",
+              "type": "STRING"
+            },
+            {
+              "name": "retSort",
+              "type": "SortDesc"
+            },
+            {
+              "name": "argSorts",
+              "type": "List"
+            },
+            {
+              "name": "rigid",
+              "type": "BOOL"
+            },
+            {
+              "name": "unique",
+              "type": "BOOL"
+            },
+            {
+              "name": "skolemConstant",
+              "type": "BOOL"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/sorts",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "SortDesc",
+          "fields": [
+            {
+              "name": "string",
+              "type": "STRING"
+            },
+            {
+              "name": "documentation",
+              "type": "STRING"
+            },
+            {
+              "name": "extendsSorts",
+              "type": "List"
+            },
+            {
+              "name": "anAbstract",
+              "type": "BOOL"
+            },
+            {
+              "name": "s",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/contracts",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "ContractDesc",
+          "fields": [
+            {
+              "name": "contractId",
+              "type": "ContractId"
+            },
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "typeName",
+              "type": "STRING"
+            },
+            {
+              "name": "htmlText",
+              "type": "STRING"
+            },
+            {
+              "name": "plainText",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/openContract",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ContractId"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/load",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "LoadParams"
+        }
+      ],
+      "returnType": {
+        "a": {
+          "typeName": "EnvironmentId",
+          "fields": [
+            {
+              "name": "envId",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "b": {
+          "typeName": "ProofId",
+          "fields": [
+            {
+              "name": "env",
+              "type": "EnvironmentId"
+            },
+            {
+              "name": "proofId",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadKey",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadExample",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadProblem",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProblemDefinition"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadTerm",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "client/sayHello",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ]
+    },
+    {
+      "name": "client/logTrace",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "LogTraceParams"
+        }
+      ]
+    },
+    {
+      "name": "client/sm",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowMessageParams"
+        }
+      ]
+    },
+    {
+      "name": "client/userResponse",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowMessageRequestParams"
+        }
+      ],
+      "returnType": {
+        "typeName": "MessageActionItem",
+        "fields": [
+          {
+            "name": "title",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "client/showDocument",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowDocumentParams"
+        }
+      ],
+      "returnType": {
+        "typeName": "ShowDocumentResult",
+        "fields": [
+          {
+            "name": "success",
+            "type": "BOOL"
+          }
+        ],
+        "documentation": ""
+      }
+    }
+  ],
+  "types": [
+    {
+      "typeName": "ExampleDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofScriptCommandDesc",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofMacroDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "category",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        },
+        {
+          "name": "scriptCommandName",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TraceValue",
+      "values": [
+        "Off",
+        "Message",
+        "All"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "SetTraceParams",
+      "fields": [
+        {
+          "name": "value",
+          "type": "TraceValue"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "EnvironmentId",
+      "fields": [
+        {
+          "name": "envId",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofId",
+      "fields": [
+        {
+          "name": "env",
+          "type": "EnvironmentId"
+        },
+        {
+          "name": "proofId",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TreeNodeDesc",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "TreeNodeId",
+      "fields": [
+        {
+          "name": "id",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeId",
+      "fields": [
+        {
+          "name": "proofId",
+          "type": "ProofId"
+        },
+        {
+          "name": "nodeId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "PrintOptions",
+      "fields": [
+        {
+          "name": "unicode",
+          "type": "BOOL"
+        },
+        {
+          "name": "width",
+          "type": "INT"
+        },
+        {
+          "name": "indentation",
+          "type": "INT"
+        },
+        {
+          "name": "pure",
+          "type": "BOOL"
+        },
+        {
+          "name": "termLabels",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeTextId",
+      "fields": [
+        {
+          "name": "nodeId",
+          "type": "NodeId"
+        },
+        {
+          "name": "nodeTextId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeTextDesc",
+      "fields": [
+        {
+          "name": "id",
+          "type": "NodeTextId"
+        },
+        {
+          "name": "result",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionId",
+      "fields": [
+        {
+          "name": "nodeId",
+          "type": "NodeId"
+        },
+        {
+          "name": "pio",
+          "type": "STRING"
+        },
+        {
+          "name": "id",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionKind",
+      "values": [
+        "BuiltIn",
+        "Script",
+        "Macro",
+        "Taclet"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionDesc",
+      "fields": [
+        {
+          "name": "commandId",
+          "type": "TermActionId"
+        },
+        {
+          "name": "displayName",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        },
+        {
+          "name": "category",
+          "type": "STRING"
+        },
+        {
+          "name": "kind",
+          "type": "TermActionKind"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "List",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "SortDesc",
+      "fields": [
+        {
+          "name": "string",
+          "type": "STRING"
+        },
+        {
+          "name": "documentation",
+          "type": "STRING"
+        },
+        {
+          "name": "extendsSorts",
+          "type": "List"
+        },
+        {
+          "name": "anAbstract",
+          "type": "BOOL"
+        },
+        {
+          "name": "s",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "FunctionDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "sort",
+          "type": "STRING"
+        },
+        {
+          "name": "retSort",
+          "type": "SortDesc"
+        },
+        {
+          "name": "argSorts",
+          "type": "List"
+        },
+        {
+          "name": "rigid",
+          "type": "BOOL"
+        },
+        {
+          "name": "unique",
+          "type": "BOOL"
+        },
+        {
+          "name": "skolemConstant",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ContractId",
+      "fields": [
+        {
+          "name": "envId",
+          "type": "EnvironmentId"
+        },
+        {
+          "name": "contractId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ContractDesc",
+      "fields": [
+        {
+          "name": "contractId",
+          "type": "ContractId"
+        },
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "displayName",
+          "type": "STRING"
+        },
+        {
+          "name": "typeName",
+          "type": "STRING"
+        },
+        {
+          "name": "htmlText",
+          "type": "STRING"
+        },
+        {
+          "name": "plainText",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "LoadParams",
+      "fields": [
+        {
+          "name": "keyFile",
+          "type": "STRING"
+        },
+        {
+          "name": "javaFile",
+          "type": "STRING"
+        },
+        {
+          "name": "classPath",
+          "type": "List"
+        },
+        {
+          "name": "bootClassPath",
+          "type": "STRING"
+        },
+        {
+          "name": "includes",
+          "type": "List"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProblemDefinition",
+      "fields": [
+        {
+          "name": "sorts",
+          "type": "List"
+        },
+        {
+          "name": "functions",
+          "type": "List"
+        },
+        {
+          "name": "predicates",
+          "type": "List"
+        },
+        {
+          "name": "antecTerms",
+          "type": "List"
+        },
+        {
+          "name": "succTerms",
+          "type": "List"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "LogTraceParams",
+      "fields": [
+        {
+          "name": "messag",
+          "type": "STRING"
+        },
+        {
+          "name": "verbose",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageType",
+      "values": [
+        "Unused",
+        "Error",
+        "Warning",
+        "Info",
+        "Log",
+        "Debug"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowMessageParams",
+      "fields": [
+        {
+          "name": "type",
+          "type": "MessageType"
+        },
+        {
+          "name": "message",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageActionItem[]",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowMessageRequestParams",
+      "fields": [
+        {
+          "name": "type",
+          "type": "MessageType"
+        },
+        {
+          "name": "message",
+          "type": "STRING"
+        },
+        {
+          "name": "actions",
+          "type": "MessageActionItem[]"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageActionItem",
+      "fields": [
+        {
+          "name": "title",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "Range",
+      "fields": [
+        {
+          "name": "start",
+          "type": "INT"
+        },
+        {
+          "name": "end",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowDocumentParams",
+      "fields": [
+        {
+          "name": "uri",
+          "type": "STRING"
+        },
+        {
+          "name": "external",
+          "type": "BOOL"
+        },
+        {
+          "name": "takeFocus",
+          "type": "BOOL"
+        },
+        {
+          "name": "selection",
+          "type": "Range"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowDocumentResult",
+      "fields": [
+        {
+          "name": "success",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TaskFinishedInfo",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "TaskStartedInfo",
+      "fields": [],
+      "documentation": ""
+    }
+  ]
+}
\ No newline at end of file
diff --git a/api.meta.md b/api.meta.md
new file mode 100644
index 00000000000..f53d88619f3
--- /dev/null
+++ b/api.meta.md
@@ -0,0 +1,480 @@
+## Types
+### Type: ContractDesc
+```
+type ContractDesc {
+ 	contractId : ContractId
+	displayName : STRING
+	htmlText : STRING
+	name : STRING
+	plainText : STRING
+	typeName : STRING
+}
+```
+
+### Type: ContractId
+```
+type ContractId {
+ 	contractId : INT
+	envId : EnvironmentId
+}
+```
+
+### Type: EnvironmentId
+```
+type EnvironmentId {
+ 	envId : STRING
+}
+```
+
+### Type: ExampleDesc
+```
+type ExampleDesc {
+ 	description : STRING
+	name : STRING
+}
+```
+
+### Type: FunctionDesc
+```
+type FunctionDesc {
+ 	argSorts : List
+	name : STRING
+	retSort : SortDesc
+	rigid : BOOL
+	skolemConstant : BOOL
+	sort : STRING
+	unique : BOOL
+}
+```
+
+### Type: List
+```
+type List {
+ 
+}
+```
+
+### Type: LoadParams
+```
+type LoadParams {
+ 	bootClassPath : STRING
+	classPath : List
+	includes : List
+	javaFile : STRING
+	keyFile : STRING
+}
+```
+
+### Type: LogTraceParams
+```
+type LogTraceParams {
+ 	messag : STRING
+	verbose : STRING
+}
+```
+
+### Type: MessageActionItem
+```
+type MessageActionItem {
+ 	title : STRING
+}
+```
+
+### Type: MessageActionItem[]
+```
+type MessageActionItem[] {
+ 
+}
+```
+
+### Type: MessageType
+```
+enum MessageType { Unused, Error, Warning, Info, Log, Debug }
+```
+
+### Type: NodeId
+```
+type NodeId {
+ 	nodeId : INT
+	proofId : ProofId
+}
+```
+
+### Type: NodeTextDesc
+```
+type NodeTextDesc {
+ 	id : NodeTextId
+	result : STRING
+}
+```
+
+### Type: NodeTextId
+```
+type NodeTextId {
+ 	nodeId : NodeId
+	nodeTextId : INT
+}
+```
+
+### Type: PrintOptions
+```
+type PrintOptions {
+ 	indentation : INT
+	pure : BOOL
+	termLabels : BOOL
+	unicode : BOOL
+	width : INT
+}
+```
+
+### Type: ProblemDefinition
+```
+type ProblemDefinition {
+ 	antecTerms : List
+	functions : List
+	predicates : List
+	sorts : List
+	succTerms : List
+}
+```
+
+### Type: ProofId
+```
+type ProofId {
+ 	env : EnvironmentId
+	proofId : STRING
+}
+```
+
+### Type: ProofMacroDesc
+```
+type ProofMacroDesc {
+ 	category : STRING
+	description : STRING
+	name : STRING
+	scriptCommandName : STRING
+}
+```
+
+### Type: ProofScriptCommandDesc
+```
+type ProofScriptCommandDesc {
+ 
+}
+```
+
+### Type: Range
+```
+type Range {
+ 	end : INT
+	start : INT
+}
+```
+
+### Type: SetTraceParams
+```
+type SetTraceParams {
+ 	value : TraceValue
+}
+```
+
+### Type: ShowDocumentParams
+```
+type ShowDocumentParams {
+ 	external : BOOL
+	selection : Range
+	takeFocus : BOOL
+	uri : STRING
+}
+```
+
+### Type: ShowDocumentResult
+```
+type ShowDocumentResult {
+ 	success : BOOL
+}
+```
+
+### Type: ShowMessageParams
+```
+type ShowMessageParams {
+ 	message : STRING
+	type : MessageType
+}
+```
+
+### Type: ShowMessageRequestParams
+```
+type ShowMessageRequestParams {
+ 	actions : MessageActionItem[]
+	message : STRING
+	type : MessageType
+}
+```
+
+### Type: SortDesc
+```
+type SortDesc {
+ 	anAbstract : BOOL
+	documentation : STRING
+	extendsSorts : List
+	s : STRING
+	string : STRING
+}
+```
+
+### Type: TaskFinishedInfo
+```
+type TaskFinishedInfo {
+ 
+}
+```
+
+### Type: TaskStartedInfo
+```
+type TaskStartedInfo {
+ 
+}
+```
+
+### Type: TermActionDesc
+```
+type TermActionDesc {
+ 	category : STRING
+	commandId : TermActionId
+	description : STRING
+	displayName : STRING
+	kind : TermActionKind
+}
+```
+
+### Type: TermActionId
+```
+type TermActionId {
+ 	id : STRING
+	nodeId : NodeId
+	pio : STRING
+}
+```
+
+### Type: TermActionKind
+```
+enum TermActionKind { BuiltIn, Script, Macro, Taclet }
+```
+
+### Type: TraceValue
+```
+enum TraceValue { Off, Message, All }
+```
+
+### Type: TreeNodeDesc
+```
+type TreeNodeDesc {
+ 
+}
+```
+
+### Type: TreeNodeId
+```
+type TreeNodeId {
+ 	id : STRING
+}
+```
+
+## Endpoints
+### client/logTrace (`server ~~> client`) 
+
+```
+Client.client/logTrace( arg0 : LogTraceParams ) **async**
+```
+
+
+### client/sayHello (`server ~~> client`) 
+
+```
+Client.client/sayHello( arg0 : STRING ) **async**
+```
+
+
+### client/showDocument (`server -> client`) 
+
+```
+Client.client/showDocument( arg0 : ShowDocumentParams ) -> ShowDocumentResult
+```
+
+
+### client/sm (`server ~~> client`) 
+
+```
+Client.client/sm( arg0 : ShowMessageParams ) **async**
+```
+
+
+### client/userResponse (`server -> client`) 
+
+```
+Client.client/userResponse( arg0 : ShowMessageRequestParams ) -> MessageActionItem
+```
+
+
+### env/contracts (`client -> server`) 
+
+```
+Server.env/contracts( arg0 : EnvironmentId ) -> ContractDesc[]
+```
+
+
+### env/functions (`client -> server`) 
+
+```
+Server.env/functions( arg0 : EnvironmentId ) -> FunctionDesc[]
+```
+
+
+### env/openContract (`client -> server`) 
+
+```
+Server.env/openContract( arg0 : ContractId ) -> ProofId
+```
+
+
+### env/sorts (`client -> server`) 
+
+```
+Server.env/sorts( arg0 : EnvironmentId ) -> SortDesc[]
+```
+
+
+### examples/list (`client -> server`) 
+
+```
+Server.examples/list(  ) -> ExampleDesc[]
+```
+
+
+### goal/actions (`client -> server`) 
+
+```
+Server.goal/actions( arg0 : NodeTextId, arg1 : INT ) -> TermActionDesc[]
+```
+
+
+### goal/apply_action (`client -> server`) 
+
+```
+Server.goal/apply_action( arg0 : TermActionId ) -> TermActionDesc[]
+```
+
+
+### goal/free (`client ~~> server`) 
+
+```
+Server.goal/free( arg0 : NodeTextId ) **async**
+```
+
+
+### goal/print (`client -> server`) 
+
+```
+Server.goal/print( arg0 : NodeId, arg1 : PrintOptions ) -> NodeTextDesc
+```
+
+
+### loading/load (`client -> server`) 
+
+```
+Server.loading/load( arg0 : LoadParams ) -> either<a,b>
+```
+
+
+### loading/loadExample (`client -> server`) 
+
+```
+Server.loading/loadExample( arg0 : STRING ) -> ProofId
+```
+
+
+### loading/loadKey (`client -> server`) 
+
+```
+Server.loading/loadKey( arg0 : STRING ) -> ProofId
+```
+
+
+### loading/loadProblem (`client -> server`) 
+
+```
+Server.loading/loadProblem( arg0 : ProblemDefinition ) -> ProofId
+```
+
+
+### loading/loadTerm (`client -> server`) 
+
+```
+Server.loading/loadTerm( arg0 : STRING ) -> ProofId
+```
+
+
+### meta/available_macros (`client -> server`) 
+
+```
+Server.meta/available_macros(  ) -> ProofMacroDesc[]
+```
+
+
+### meta/available_script_commands (`client -> server`) 
+
+```
+Server.meta/available_script_commands(  ) -> ProofScriptCommandDesc[]
+```
+
+
+### meta/version (`client -> server`) 
+
+```
+Server.meta/version(  ) -> STRING
+```
+
+
+### proofTree/children (`client -> server`) 
+
+```
+Server.proofTree/children( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+```
+
+
+### proofTree/root (`client -> server`) 
+
+```
+Server.proofTree/root( arg0 : ProofId ) -> TreeNodeDesc
+```
+
+
+### proofTree/subtree (`client -> server`) 
+
+```
+Server.proofTree/subtree( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+```
+
+
+### server/exit (`client ~~> server`) 
+
+```
+Server.server/exit(  ) **async**
+```
+
+
+### server/setTrace (`client ~~> server`) 
+
+```
+Server.server/setTrace( arg0 : SetTraceParams ) **async**
+```
+
+
+### server/shutdown (`client -> server`) 
+
+```
+Server.server/shutdown(  ) -> BOOL
+```
+
+
diff --git a/api.py b/api.py
new file mode 100644
index 00000000000..c83050a763e
--- /dev/null
+++ b/api.py
@@ -0,0 +1,374 @@
+import enum
+import abc
+import typing
+class ExampleDesc:
+    """"""
+
+    name : str
+    description : str
+
+class ProofScriptCommandDesc:
+    """"""
+
+
+class ProofMacroDesc:
+    """"""
+
+    name : str
+    category : str
+    description : str
+    scriptCommandName : str
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+class SetTraceParams:
+    """"""
+
+    value : TraceValue
+
+class EnvironmentId:
+    """"""
+
+    envId : str
+
+class ProofId:
+    """"""
+
+    env : EnvironmentId
+    proofId : str
+
+class TreeNodeDesc:
+    """"""
+
+
+class TreeNodeId:
+    """"""
+
+    id : str
+
+class NodeId:
+    """"""
+
+    proofId : ProofId
+    nodeId : int
+
+class PrintOptions:
+    """"""
+
+    unicode : bool
+    width : int
+    indentation : int
+    pure : bool
+    termLabels : bool
+
+class NodeTextId:
+    """"""
+
+    nodeId : NodeId
+    nodeTextId : int
+
+class NodeTextDesc:
+    """"""
+
+    id : NodeTextId
+    result : str
+
+class TermActionId:
+    """"""
+
+    nodeId : NodeId
+    pio : str
+    id : str
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+class TermActionDesc:
+    """"""
+
+    commandId : TermActionId
+    displayName : str
+    description : str
+    category : str
+    kind : TermActionKind
+
+class List:
+    """"""
+
+
+class SortDesc:
+    """"""
+
+    string : str
+    documentation : str
+    extendsSorts : List
+    anAbstract : bool
+    s : str
+
+class FunctionDesc:
+    """"""
+
+    name : str
+    sort : str
+    retSort : SortDesc
+    argSorts : List
+    rigid : bool
+    unique : bool
+    skolemConstant : bool
+
+class ContractId:
+    """"""
+
+    envId : EnvironmentId
+    contractId : int
+
+class ContractDesc:
+    """"""
+
+    contractId : ContractId
+    name : str
+    displayName : str
+    typeName : str
+    htmlText : str
+    plainText : str
+
+class LoadParams:
+    """"""
+
+    keyFile : str
+    javaFile : str
+    classPath : List
+    bootClassPath : str
+    includes : List
+
+class ProblemDefinition:
+    """"""
+
+    sorts : List
+    functions : List
+    predicates : List
+    antecTerms : List
+    succTerms : List
+
+class LogTraceParams:
+    """"""
+
+    messag : str
+    verbose : str
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+class ShowMessageParams:
+    """"""
+
+    type : MessageType
+    message : str
+
+class MessageActionItem[]:
+    """"""
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type : MessageType
+    message : str
+    actions : MessageActionItem[]
+
+class MessageActionItem:
+    """"""
+
+    title : str
+
+class Range:
+    """"""
+
+    start : int
+    end : int
+
+class ShowDocumentParams:
+    """"""
+
+    uri : str
+    external : bool
+    takeFocus : bool
+    selection : Range
+
+class ShowDocumentResult:
+    """"""
+
+    success : bool
+
+class TaskFinishedInfo:
+    """"""
+
+
+class TaskStartedInfo:
+    """"""
+
+
+class KeyServer():
+    def env_contracts(self, arg0 : EnvironmentId) -> typing.List[ContractDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/contracts", )
+
+    def env_functions(self, arg0 : EnvironmentId) -> typing.List[FunctionDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/functions", )
+
+    def env_openContract(self, arg0 : ContractId) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("env/openContract", )
+
+    def env_sorts(self, arg0 : EnvironmentId) -> typing.List[SortDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/sorts", )
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+       """"""
+
+       return self.rpc.call_sync("examples/list", )
+
+    def goal_actions(self, arg0 : NodeTextId, arg1 : int) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self.rpc.call_sync("goal/actions", )
+
+    def goal_apply_action(self, arg0 : TermActionId) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self.rpc.call_sync("goal/apply_action", )
+
+    def goal_free(self, arg0 : NodeTextId):
+        """"""
+
+        return self.rpc.call_async("goal/free", )
+
+    def goal_print(self, arg0 : NodeId, arg1 : PrintOptions) -> NodeTextDesc:
+       """"""
+
+       return self.rpc.call_sync("goal/print", )
+
+    def loading_load(self, arg0 : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+       """"""
+
+       return self.rpc.call_sync("loading/load", )
+
+    def loading_loadExample(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadExample", )
+
+    def loading_loadKey(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadKey", )
+
+    def loading_loadProblem(self, arg0 : ProblemDefinition) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadProblem", )
+
+    def loading_loadTerm(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadTerm", )
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+       """"""
+
+       return self.rpc.call_sync("meta/available_macros", )
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+       """"""
+
+       return self.rpc.call_sync("meta/available_script_commands", )
+
+    def meta_version(self, ) -> STRING:
+       """"""
+
+       return self.rpc.call_sync("meta/version", )
+
+    def proofTree_children(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self.rpc.call_sync("proofTree/children", )
+
+    def proofTree_root(self, arg0 : ProofId) -> TreeNodeDesc:
+       """"""
+
+       return self.rpc.call_sync("proofTree/root", )
+
+    def proofTree_subtree(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self.rpc.call_sync("proofTree/subtree", )
+
+    def server_exit(self, ):
+        """"""
+
+        return self.rpc.call_async("server/exit", )
+
+    def server_setTrace(self, arg0 : SetTraceParams):
+        """"""
+
+        return self.rpc.call_async("server/setTrace", )
+
+    def server_shutdown(self, ) -> BOOL:
+       """"""
+
+       return self.rpc.call_sync("server/shutdown", )
+
+class Client(abc.AbcMeta):
+    @abstractmethod
+    def client_logTrace(self, arg0 : LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, arg0 : str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, arg0 : ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, arg0 : ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, arg0 : ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
+
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 06da529607f..95ba46fe7be 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -12,6 +12,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.stream.Stream;
 
 import de.uka.ilkd.key.logic.RenamingTable;
 import de.uka.ilkd.key.logic.Sequent;
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index f7aadd6467c..84a1789e01f 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    implementation(project(":keyext.api"))
     implementation("com.github.javaparser:javaparser-core:3.25.5")
     implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.5")
 }
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/DocGen.java b/keyext.api.doc/src/main/java/DocGen.java
new file mode 100644
index 00000000000..36aed393607
--- /dev/null
+++ b/keyext.api.doc/src/main/java/DocGen.java
@@ -0,0 +1,189 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class DocGen implements Supplier<String> {
+    private final Metamodel.KeyApi metamodel;
+    private PrintWriter out;
+    private final StringWriter target = new StringWriter();
+
+    public DocGen(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+            printHeader();
+
+            out.format("## Types%n");
+            metamodel.types()
+                    .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                    .forEach(this::printType);
+
+            out.format("## Endpoints%n");
+            metamodel.endpoints()
+                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                    .forEach(this::endpoints);
+            printFooter();
+        }
+        return target.toString();
+    }
+
+    private void printFooter() {
+
+    }
+
+    private void printHeader() {
+
+
+    }
+
+    private void endpoints(Metamodel.Endpoint endpoint) {
+        //out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        //out.println(getJavaDoc(typeDeclaration));
+        //out.println("\n");
+
+        var direction = "";
+        if (endpoint instanceof Metamodel.ServerRequest sr)
+            direction = "client -> server";
+        else if (endpoint instanceof Metamodel.ClientRequest sr)
+            direction = "server -> client";
+        else if (endpoint instanceof Metamodel.ServerNotification sr)
+            direction = "client ~~> server";
+        else if (endpoint instanceof Metamodel.ClientNotification sr)
+            direction = "server ~~> client";
+
+        out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
+        out.format("```%n");
+        var args = endpoint.args();
+        final var a = args.stream()
+                .map(it -> "%s : %s".formatted(it.name(), it.type()))
+                .collect(Collectors.joining(", "));
+        if (endpoint instanceof Metamodel.ServerRequest sr) {
+            out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        } else if (endpoint instanceof Metamodel.ClientRequest sr)
+            out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        else if (endpoint instanceof Metamodel.ServerNotification sr)
+            out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+        else if (endpoint instanceof Metamodel.ClientNotification sr)
+            out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+        out.format("```%n");
+
+        out.println(endpoint.documentation());
+        out.println();
+    }
+
+    private void printType(Metamodel.Type type) {
+        out.format("### Type: %s%n", type.name());
+        if (type instanceof Metamodel.ObjectType ot) {
+            out.format("""
+                    ```
+                    type %s {
+                     %s
+                    }
+                    ```
+                    """.formatted(type.name(),
+                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                            .collect(Collectors.joining("\n"))));
+        }
+
+        if (type instanceof Metamodel.EnumType et) {
+            out.format("""
+                    ```
+                    enum %s { %s }
+                    ```
+                    """.formatted(type.name(), String.join(", ", et.values())
+            ));
+            out.format(type.documentation());
+        }
+        out.format(type.documentation());
+        out.println();
+    }
+
+        /*
+        private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
+            var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+                            () -> m.getAnnotationByName("JsonRequest"))
+                    .orElseThrow();
+
+            var segment = getJsonSegment(td) + "/";
+            String name = "";
+
+            if (annotationExpr.isMarkerAnnotationExpr()) {
+                name = m.getNameAsString();
+            } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+                var sma = annotationExpr.asSingleMemberAnnotationExpr();
+                name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+            } else {
+                var ne = annotationExpr.asNormalAnnotationExpr();
+                for (MemberValuePair pair : ne.getPairs()) {
+                    switch (pair.getName().asString()) {
+                        case "value":
+                            name = pair.getValue().asLiteralStringValueExpr().getValue();
+                            break;
+                        case "useSegment":
+                            if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+                                segment = "";
+                            }
+                    }
+                }
+            }
+            return segment + name;
+        }
+
+        @Nonnull
+        private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
+            if (typeDeclaration.getJavadoc().isPresent()) {
+                final var javadoc = typeDeclaration.getJavadoc().get();
+                return javadoc.getDescription().toText()
+                        + "\n\n"
+                        + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+                        .collect(Collectors.joining("\n"));
+            }
+            return "";
+        }
+
+        private static String type (MethodDeclaration method){
+            if (method.getAnnotationByName("JsonNotification").isPresent())
+                return "notification";
+            if (method.getAnnotationByName("JsonRequest").isPresent())
+                return "request";
+            return "";
+        }
+
+        private static boolean isExported (MethodDeclaration method){
+            return method.getAnnotationByName("JsonNotification").isPresent()
+                    || method.getAnnotationByName("JsonRequest").isPresent();
+        }
+
+        private void printHeader () {
+            out.format("# KeY-API%n%n");
+        }
+
+        private void printFooter () {
+        }
+
+
+    /*
+    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+        return it.getAnnotationByName("JsonSegment").isPresent();
+    }
+
+    private static String getJsonSegment(TypeDeclaration<?> it) {
+        var ae = it.getAnnotationByName("JsonSegment").get();
+        return ae.asSingleMemberAnnotationExpr().getMemberValue()
+                .asLiteralStringValueExpr().getValue();
+    }
+     */
+
+}
+
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index a9df59adef8..2855e390f75 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -1,25 +1,27 @@
-import com.github.javaparser.ParseResult;
+import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.body.TypeDeclaration;
-import com.github.javaparser.ast.expr.MemberValuePair;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
-import com.github.javaparser.javadoc.JavadocBlockTag;
-import com.github.javaparser.resolution.SymbolResolver;
-import com.github.javaparser.resolution.TypeSolver;
-import com.github.javaparser.symbolsolver.JavaSymbolSolver;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.TypeSolverBuilder;
-import com.github.javaparser.utils.SourceRoot;
-
-import javax.annotation.Nonnull;
-import java.io.FileWriter;
+import com.google.gson.*;
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
+import sun.misc.Unsafe;
+
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author Alexander Weigl
@@ -28,135 +30,250 @@
 public class ExtractMetaData {
     private static PrintWriter out;
 
-    public static void main(String[] args) throws IOException {
-        System.out.println("XXX" + Arrays.toString(args));
-        ParserConfiguration config = new ParserConfiguration();
-        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
-        /*config.setAttributeComments(true);
-        config.setLexicalPreservationEnabled(false);
-        config.setStoreTokens(false);
-        config.setIgnoreAnnotationsWhenAttributingComments(true);
-        config.setDoNotAssignCommentsPrecedingEmptyLines(true);*/
-        //var root = Paths.get(args[0]);
-        TypeSolver typeSolver = new TypeSolverBuilder()
-                .withSourceCode("keyext.api/src/main/java")
-                .withSourceCode("key.core/src/main/java")
-                .withSourceCode("key.util/src/main/java")
-                .withCurrentJRE()
-                .build();
-        SymbolResolver symbolResolver = new JavaSymbolSolver(typeSolver);
-        config.setSymbolResolver(symbolResolver);
-        var source = new SourceRoot(Paths.get("keyext.api", "src", "main", "java"), config);
-        var cu = source.tryToParse();
-        var jsonSegment = Comparator.comparing(ExtractMetaData::getJsonSegment);
-        var segments = cu.stream().filter(ParseResult::isSuccessful)
-                .filter(it -> it.getResult().get().getPrimaryType().isPresent())
-                .map(it -> it.getResult().get().getPrimaryType().get())
-                .filter(ExtractMetaData::hasJsonSegment)
-                .sorted(jsonSegment)
-                .toList();
+    private static final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
+    private static final List<Metamodel.Type> types = new LinkedList<>();
+    private static final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
 
-        try (var out = new PrintWriter(new FileWriter("doc.md"))) {
-            ExtractMetaData.out = out;
-            printHeader(segments);
-            segments.forEach(ExtractMetaData::printDocumentation);
-            printFooter(segments);
+    public static void main(String[] args) {
+        for (Method method : KeyApi.class.getMethods()) {
+            addServerEndpoint(method);
         }
 
-        // "org.keyproject.key.api.remoteapi.KeyApi";
+        for (Method method : ClientApi.class.getMethods()) {
+            addClientEndpoint(method);
+        }
+
+        try {
+            Files.writeString(Paths.get("api.meta.json"), getGson().toJson(keyApi));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            var n = new DocGen(keyApi);
+            Files.writeString(Paths.get("api.meta.md"), n.get());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            var n = new PyGen(keyApi);
+            Files.writeString(Paths.get("api.py"), n.get());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
-    private static void printDocumentation(TypeDeclaration<?> typeDeclaration) {
-        out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
-        out.println(getJavaDoc(typeDeclaration));
-        out.println("\n");
+    private static Gson getGson() {
+        return new GsonBuilder()
+                .setPrettyPrinting()
+                .registerTypeAdapter(Type.class, new JsonSerializer<Metamodel.Type>() {
+                    @Override
+                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializationContext context) {
+                        JsonObject json = (JsonObject) context.serialize(src);
+                        json.addProperty("kind", src.kind());
+                        return json;
+                    }
+                })
+                .create();
+    }
 
-        for (MethodDeclaration method : typeDeclaration.getMethods()) {
-            if (!isExported(method)) continue;
+    private static void addServerEndpoint(Method method) {
+        var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
+        if (jsonSegment == null) return;
+        var segment = jsonSegment.value();
 
-            String callName = getCallName(method, typeDeclaration);
+        var req = method.getAnnotation(JsonRequest.class);
+        var resp = method.getAnnotation(JsonNotification.class);
 
-            out.format("### %s (type: %s) %n%n", callName, type(method));
+        var args = translate(method.getParameters());
 
-            out.println(getJavaDoc(method));
+        if (req != null) {
+            var mn = callMethodName(method.getName(), segment, req.value(), req.useSegment());
 
-            out.println();
+            if (method.getReturnType() == Void.class) {
+                System.err.println("Found void as return type for a request!  " + method);
+                return;
+            }
+
+            var retType = getOrFindType(method.getGenericReturnType());
+            Objects.requireNonNull(retType, "No retType found " + method.getGenericReturnType());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ServerRequest(mn, documentation, args, retType);
+            endpoints.add(mm);
+            return;
+        }
+
+        if (resp != null) {
+            var mn = callMethodName(method.getName(), segment, resp.value(), resp.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ServerNotification(mn, documentation, args);
+            endpoints.add(mm);
+            return;
         }
+
+        throw new IllegalStateException();
     }
 
-    private static String getCallName(MethodDeclaration m, TypeDeclaration<?> td) {
-        var annotationExpr = m.getAnnotationByName("JsonNotification").or(
-                        () -> m.getAnnotationByName("JsonRequest"))
-                .orElseThrow();
+    private static String findDocumentation(Method method) {
+        // TODO get compilation, get type, find method, getJavaDocComment()
+        return "";
+    }
 
-        var segment = getJsonSegment(td) + "/";
-        String name = "";
+    private static List<Metamodel.Argument> translate(Parameter[] parameters) {
+        return Arrays.stream(parameters).map(ExtractMetaData::translate).toList();
+    }
 
-        if (annotationExpr.isMarkerAnnotationExpr()) {
-            name = m.getNameAsString();
-        } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
-            var sma = annotationExpr.asSingleMemberAnnotationExpr();
-            name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
-        } else {
-            var ne = annotationExpr.asNormalAnnotationExpr();
-            for (MemberValuePair pair : ne.getPairs()) {
-                switch (pair.getName().asString()) {
-                    case "value":
-                        name = pair.getValue().asLiteralStringValueExpr().getValue();
-                        break;
-                    case "useSegment":
-                        if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
-                            segment = "";
-                        }
-                }
-            }
-        }
-        return segment + name;
+    private static Metamodel.Argument translate(Parameter parameter) {
+        var type =  getOrFindType(parameter.getType()).name();
+        return new Metamodel.Argument(parameter.getName(), type);
     }
 
+    private static Metamodel.Type getOrFindType(Class<?> type) {
+        System.out.println(type);
+        if (type == CompletableFuture.class) {
+            return getOrFindType(type.getTypeParameters()[0].getClass());
+        }
 
-    @Nonnull
-    private static String getJavaDoc(NodeWithJavadoc<?> typeDeclaration) {
-        if (typeDeclaration.getJavadoc().isPresent()) {
-            final var javadoc = typeDeclaration.getJavadoc().get();
-            return javadoc.getDescription().toText()
-                    + "\n\n"
-                    + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
-                    .collect(Collectors.joining("\n"));
+        if (type == Unsafe.class || type == Class.class || type == Constructor.class || type == Proof.class) {
+            throw new IllegalStateException("Forbidden class reached!");
         }
-        return "";
+
+        if (type == String.class) return Metamodel.BuiltinType.STRING;
+        if (type == Integer.class) return Metamodel.BuiltinType.INT;
+        if (type == Double.class) return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.class) return Metamodel.BuiltinType.LONG;
+        if (type == Character.class) return Metamodel.BuiltinType.LONG;
+        if (type == File.class) return Metamodel.BuiltinType.STRING;
+        if (type == Boolean.class) return Metamodel.BuiltinType.BOOL;
+        if (type == Boolean.TYPE) return Metamodel.BuiltinType.BOOL;
+
+        if (type == Integer.TYPE) return Metamodel.BuiltinType.INT;
+        if (type == Double.TYPE) return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.TYPE) return Metamodel.BuiltinType.LONG;
+        if (type == Character.TYPE) return Metamodel.BuiltinType.LONG;
+
+        System.out.println(type);
+        var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
+        if (t.isPresent()) return t.get();
+        var a = createType(type);
+        types.add(a);
+        return a;
     }
 
-    private static String type(MethodDeclaration method) {
-        if (method.getAnnotationByName("JsonNotification").isPresent())
-            return "notification";
-        if (method.getAnnotationByName("JsonRequest").isPresent())
-            return "request";
-        return "";
+    private static Metamodel.Type createType(Class<?> type) {
+        final var documentation = findDocumentation(type);
+        if (type.isEnum())
+            return new Metamodel.EnumType(type.getSimpleName(),
+                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                    documentation);
+
+
+        var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
+        final var list = Arrays.stream(type.getDeclaredFields())
+                .map(it -> new Metamodel.Field(it.getName(), getOrFindType(it.getType()).name()))
+                .toList();
+        obj.fields().addAll(list);
+        return obj;
     }
 
-    private static boolean isExported(MethodDeclaration method) {
-        return method.getAnnotationByName("JsonNotification").isPresent()
-                || method.getAnnotationByName("JsonRequest").isPresent();
+    private static String findDocumentation(Class<?> type) {
+        var parser = initJavaParser();
+        var fileName = findFileForType(type);
+
+        if (Files.exists(fileName)) {
+            try {
+                return parser.parse(fileName).getResult().flatMap(CompilationUnit::getPrimaryType)
+                        .flatMap(NodeWithJavadoc::getJavadocComment)
+                        .map(Comment::getContent).orElse("");
+            } catch (IOException e) {
+                e.printStackTrace();
+                return "";
+            }
+        } else return "";
     }
 
-    private static void printHeader(List<? extends TypeDeclaration<?>> segments) {
-        out.format("# KeY-API%n%n");
+    private static Path findFileForType(Class<?> type) {
+        final var folderString = type.getPackageName().replaceAll("\\.", "/");
+        var folder = Paths.get("keyext.api", "src", "main", "java", folderString);
+        final Class<?> declaringClass = type.getDeclaringClass();
+        var fileName = (declaringClass != null ? declaringClass : type).getSimpleName() + ".java";
+        var file = folder.resolve(fileName);
+        return file;
     }
 
-    private static void printFooter(List<? extends TypeDeclaration<?>> segments) {
 
+    private static void addClientEndpoint(Method method) {
+        var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
+        var segment = jsonSegment.value();
+
+        var req = method.getAnnotation(JsonRequest.class);
+        var resp = method.getAnnotation(JsonNotification.class);
+
+        var args = translate(method.getParameters());
+
+        if (req != null) {
+            var retType = getOrFindType(method.getGenericReturnType());
+            Objects.requireNonNull(retType);
+            var mn = callMethodName(method.getName(), segment, req.value(), req.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ClientRequest(mn, documentation, args, retType);
+            endpoints.add(mm);
+            return;
+        }
+
+        if (resp != null) {
+            var mn = callMethodName(method.getName(), segment, resp.value(), resp.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ClientNotification(mn, documentation, args);
+            endpoints.add(mm);
+        }
+    }
 
+    private static String callMethodName(String method, String segment, String userValue, boolean useSegment) {
+        if (!useSegment) {
+            if (userValue == null || userValue.isBlank()) {
+                return method;
+            } else {
+                return userValue;
+            }
+        } else {
+            if (userValue == null || userValue.isBlank()) {
+                return segment + "/" + method;
+            } else {
+                return segment + "/" + userValue;
+            }
+        }
     }
 
+    private static Metamodel.Type getOrFindType(Type genericReturnType) {
+        if (genericReturnType instanceof Class c) return getOrFindType(c);
+        if (genericReturnType instanceof ParameterizedType pt) {
+            if (Objects.equals(pt.getRawType().getTypeName(), CompletableFuture.class.getTypeName())) {
+                return getOrFindType(pt.getActualTypeArguments()[0]);
+            }
+            if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
+                var base = getOrFindType(pt.getActualTypeArguments()[0]);
+                return new Metamodel.ListType(base, "");
+            }
 
-    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
-        return it.getAnnotationByName("JsonSegment").isPresent();
+            if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
+                var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
+                var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
+                return new Metamodel.EitherType(base1, base2, "");
+            }
+        }
+        return null;
     }
 
-    private static String getJsonSegment(TypeDeclaration<?> it) {
-        var ae = it.getAnnotationByName("JsonSegment").get();
-        return ae.asSingleMemberAnnotationExpr().getMemberValue()
-                .asLiteralStringValueExpr().getValue();
+    static JavaParser initJavaParser() {
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
+        config.setAttributeComments(true);
+        config.setLexicalPreservationEnabled(false);
+        config.setStoreTokens(false);
+        config.setIgnoreAnnotationsWhenAttributingComments(true);
+        config.setDoNotAssignCommentsPrecedingEmptyLines(true);
+        return new JavaParser(config);
     }
+
 }
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
new file mode 100644
index 00000000000..833699cfe0c
--- /dev/null
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -0,0 +1,93 @@
+import org.jspecify.annotations.NullMarked;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+@NullMarked
+public class Metamodel {
+    public record KeyApi(
+            List<Endpoint> endpoints,
+            List<Type> types
+    ) {
+    }
+
+    sealed interface Endpoint {
+        String name();
+
+        String documentation();
+
+        default String kind() {
+            return getClass().getSimpleName();
+        }
+
+        List<Argument> args();
+    }
+
+    public record Argument(String name, String type) {
+    }
+
+    record ServerRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    }
+
+    record ServerNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    }
+
+    record ClientRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    }
+
+    record ClientNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    }
+
+    record Field(String name, /*Type*/ String type) {
+    }
+
+    sealed interface Type {
+        default String kind() {
+            return getClass().getSimpleName();
+        }
+
+        String documentation();
+
+        String name();
+    }
+
+    enum BuiltinType implements Type {
+        INT, LONG, STRING, BOOL, DOUBLE;
+
+        @Override
+        public String documentation() {
+            return "built-in data type";
+        }
+    }
+
+    record ListType(Type type, String documentation) implements Type {
+        @Override
+        public String name() {
+            return type().name() + "[]";
+        }
+    }
+
+    record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
+        @Override
+        public String name() {
+            return typeName;
+        }
+    }
+
+    public record EitherType(Type a, Type b, String documentation) implements Type {
+        @Override
+        public String name() {
+            return "either<a,b>";
+        }
+    }
+
+    public record EnumType(String typeName, List<String> values, String documentation) implements Type {
+        @Override
+        public String name() {
+            return typeName;
+        }
+    }
+}
diff --git a/keyext.api.doc/src/main/java/PyGen.java b/keyext.api.doc/src/main/java/PyGen.java
new file mode 100644
index 00000000000..357c2f51e8d
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PyGen.java
@@ -0,0 +1,136 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class PyGen implements Supplier<String> {
+    private final Metamodel.KeyApi metamodel;
+    private PrintWriter out;
+    private final StringWriter target = new StringWriter();
+
+    public PyGen(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+
+            out.format("""
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod                    
+                    """);
+
+            metamodel.types().forEach(this::printType);
+            server(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+            client(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+        }
+        return target.toString();
+    }
+
+    private void client(Stream<Metamodel.Endpoint> sorted) {
+        out.format("class Client(abc.AbcMeta):%n");
+        sorted.forEach(this::clientEndpoint);
+    }
+
+    private void clientEndpoint(Metamodel.Endpoint endpoint) {
+        var args = endpoint.args().stream()
+                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                .collect(Collectors.joining(", "));
+        out.format("    @abstractmethod%n");
+        if (endpoint instanceof Metamodel.ClientRequest sr) {
+            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args, asPython(sr.returnType()));
+        } else {
+            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+        }
+        out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+        out.format("        pass".formatted(endpoint.name(), ""));
+        out.println();
+        out.println();
+    }
+
+    private void server(Stream<Metamodel.Endpoint> sorted) {
+        out.format("class KeyServer():%n");
+        sorted.forEach(this::serverEndpoint);
+    }
+
+    private void serverEndpoint(Metamodel.Endpoint endpoint) {
+        var args = endpoint.args().stream()
+                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                .collect(Collectors.joining(", "));
+        if (endpoint instanceof Metamodel.ServerRequest sr) {
+            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                    asPython(sr.returnType()));
+            out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
+            out.format("       return self.rpc.call_sync(\"%s\", %s)".formatted(endpoint.name(), ""));
+        } else {
+            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+            out.format("        return self.rpc.call_async(\"%s\", %s)".formatted(endpoint.name(), ""));
+        }
+        out.println();
+        out.println();
+    }
+
+    private void printType(Metamodel.Type type) {
+        if (type instanceof Metamodel.ObjectType ot) {
+            out.format("class %s:%n".formatted(type.name()));
+            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+            ot.fields().forEach(it -> out.format("    %s : %s%n".formatted(it.name(), asPython(it.type()))));
+        } else if (type instanceof Metamodel.EnumType et) {
+            out.format("class %s(enum.Enum):%n".formatted(type.name()));
+            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+            et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
+        }
+        out.println();
+    }
+
+    private String asPython(String typeName) {
+        return switch (typeName) {
+            case "INT" -> "int";
+            case "LONG" -> "int";
+            case "STRING" -> "str";
+            case "BOOL" -> "bool";
+            case "DOUBLE" -> "float";
+            default -> {
+                var t = findType(typeName);
+                yield asPython(t);
+            }
+        };
+    }
+
+    private String asPython(Metamodel.Type t) {
+        if (t instanceof Metamodel.ListType lt) {
+            return "typing.List[" + asPython(lt.type()) + "]";
+        }
+
+        if (t instanceof Metamodel.EitherType lt) {
+            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+        }
+        return t.name();
+    }
+
+    private Metamodel.Type findType(String typeName) {
+        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
+                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
+    }
+}
\ No newline at end of file
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index c2b84249430..fbbbac93898 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -10,10 +10,10 @@ plugins {
 description "Verification server interface via JSON-RPC"
 
 dependencies {
-    implementation(project(":key.core"))
-    implementation(project(":key.ui"))
+    api(project(":key.core"))
+    api(project(":key.ui"))
 
-    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
+    api("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index fd1b8352356..7ff86ae2c09 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -3,7 +3,6 @@
 import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.gui.Example;
 import de.uka.ilkd.key.gui.ExampleChooser;
 import de.uka.ilkd.key.macros.ProofMacroFacade;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -32,6 +31,7 @@
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.internal.NodeText;
+import org.keyproject.key.api.remoteapi.ExampleDesc;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
@@ -73,13 +73,14 @@ public KeyApiImpl() {
 
     @Override
     @JsonRequest
-    public CompletableFuture<List<Example>> examples() {
-        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    public CompletableFuture<List<ExampleDesc>> examples() {
+        return CompletableFutures.computeAsync((c) ->
+                ExampleChooser.listExamples(ExampleChooser.lookForExamples()).stream().map(it -> ExampleDesc.from(it)).toList());
     }
 
     @Override
-    public CompletableFuture<Void> shutdown() {
-        return CompletableFuture.completedFuture(null);
+    public CompletableFuture<Boolean> shutdown() {
+        return CompletableFuture.completedFuture(true);
     }
 
     @Override
@@ -192,7 +193,8 @@ private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
     }
 
     private NodeDesc asNodeDesc(ProofId proofId, Node it) {
-        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(), it.getNodeInfo().getScriptRuleApplication());
+        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(),
+                it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
@@ -204,10 +206,11 @@ public CompletableFuture<NodeDesc> tree(ProofId proofId) {
     }
 
     private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
+        final List<NodeDesc> list = root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
                 root.getNodeInfo().getBranchLabel(),
                 root.getNodeInfo().getScriptRuleApplication(),
-                root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList()
+                list
         );
     }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
deleted file mode 100644
index 0a27c633e5a..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api;
-
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public record NodeTextDesc(NodeTextId id, String result)  {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
index a99bed5fda9..f28001e8c15 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -2,9 +2,3 @@
 
 import org.keyproject.key.api.data.KeyIdentifications.NodeId;
 
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public record NodeTextId(NodeId nodeId, int nodeTextId) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 51e0053eed6..31714a361d7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -9,10 +9,11 @@
 import de.uka.ilkd.key.pp.PosInSequent;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
 import org.keyproject.key.api.data.TermActionDesc;
 import org.keyproject.key.api.data.TermActionKind;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 0698a50a982..6d66823142a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -5,8 +5,7 @@
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.keyproject.key.api.NodeTextId;
+import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.internal.NodeText;
 
 import java.lang.ref.WeakReference;
@@ -109,11 +108,12 @@ public record ProofId(EnvironmentId env, String proofId) {
 
     /**
      * @author Alexander Weigl
-     * @version 1 (13.10.23)
+     * @version 1 (29.10.23)
      */
-    public record PrintId(String id) {
+    public record NodeTextId(NodeId nodeId, int nodeTextId) {
     }
 
+
     /**
      * @author Alexander Weigl
      * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index 9e24e0f4cd7..eda5e693f64 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,6 +1,6 @@
 package org.keyproject.key.api.data;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -8,7 +8,8 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record NodeDesc(KeyIdentifications.NodeId nodeid, String branchLabel,
+public record NodeDesc(KeyIdentifications.NodeId nodeid,
+                       String branchLabel,
                        boolean scriptRuleApplication,
                        @Nullable List<NodeDesc> children
 ) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
new file mode 100644
index 00000000000..333b24f1c73
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.data;
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result)  {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index 4e2de0d4010..d952ea3a654 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -1,6 +1,7 @@
 package org.keyproject.key.api.data;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
deleted file mode 100644
index 96d22acee47..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.keyproject.key.api.data;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
deleted file mode 100644
index 96d22acee47..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.keyproject.key.api.data;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index 9ccbb03049f..6c52dfd39aa 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -10,5 +10,5 @@
 @JsonSegment("examples")
 public interface ExampleApi {
     @JsonRequest("list")
-    CompletableFuture<List<Example>> examples();
+    CompletableFuture<List<ExampleDesc>> examples();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
new file mode 100644
index 00000000000..c0091943899
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
@@ -0,0 +1,13 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ExampleDesc(String name, String description) {
+    public static ExampleDesc from(Example example) {
+        return new ExampleDesc(example.getName(), example.getDescription());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index 2f34293f0d5..959ed91570c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -3,8 +3,7 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.NodeTextDesc;
-import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.data.NodeTextDesc;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index ddd1fe408e6..00e85b9e021 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -29,7 +29,7 @@ public interface ServerManagement {
      * error: code and message set in case an exception happens during shutdown request.
      */
     @JsonRequest
-    CompletableFuture<Void> shutdown();
+    CompletableFuture<Boolean> shutdown();
 
     /**
      * Exit Notification (:arrow_right:)
diff --git a/keyext.api/src/main/python/keyapi/rpc.py b/keyext.api/src/main/python/keyapi/rpc.py
deleted file mode 100644
index 89dc6f3e041..00000000000
--- a/keyext.api/src/main/python/keyapi/rpc.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import abc
-import json
-from abc import abstractmethod
-from multiprocessing import Process, SimpleQueue, Lock, Value
-
-
-class Client(abc.ABC):
-    @abstractmethod
-    def handle(self, response):
-        pass
-
-
-class JsonRPCHandler:
-    client: Client
-
-    def __init__(self, in_stream, out_stream):
-        self.input = in_stream
-        self.out = out_stream
-        self.__id = 0
-        self.client: Client
-
-        self._events = dict()
-        self._responses = dict()
-
-        # t: Process = Process(target=self.__read)
-        # t.start()
-
-    def read_message(self):
-        length = 0
-        for clength in self.input.readlines():
-            if clength.startswith("Content-Length:"):
-                length = int(clength[14:])
-                break
-
-        payload = self.input.read(2 + length)
-        r = json.loads(payload)
-        if "id" in r:  # JSON response for request
-            rid = r["id"]
-            # self._responses[rid] = r
-            # if rid in self._events:
-            #    self._events[rid].set()
-        else:  # JSON notification
-            self.client.handle(r)
-        return r
-
-    def __read(self):
-        while True:
-            self.read_message()
-
-    # def __create_event(self, number):
-    #    self._events[number] = Event()
-
-    def _send(self, method, params):
-        self.__id += 1
-        id = self.__id
-        # self.__create_event(self.__id)
-        req = {"jsonrpc": "2.0", "method": method, "params": params, "id": self.__id}
-
-        self._write(json.dumps(req))
-        # self._wait_for(self.__id)
-
-        r = dict()
-        while "id" in r and str(r[id]) != str(id):
-            r = self.read_message()
-        return r
-
-    def _write(self, msg):
-        length = len(msg)
-        self.out.write(f"Content-Length: {length}\r\n")
-        self.out.write("\r\n")
-        self.out.write(msg)
-        self.out.write("\r\n")
-        self.out.flush()
-
-   # def _wait_for(self, rid):
-   #     self._events[rid].wait()
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index ae34b339231..5e0c87e06f5 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -16,7 +15,6 @@
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -34,7 +32,7 @@ void setup() throws IOException {
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        KeyApiImpl impl = new KeyApiImpl(new KeyAdapter(null));
+        KeyApiImpl impl = new KeyApiImpl();
         Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer, impl);
         impl.setClientApi(serverLauncher.getRemoteProxy());
 
@@ -58,7 +56,7 @@ void setup() throws IOException {
     }
 
     @AfterEach
-    void teardown() throws ExecutionException, InterruptedException, TimeoutException {
+    void teardown() {
         serverListening.cancel(true);
         clientListening.cancel(true);
     }
diff --git a/keyext.api/src/main/python/keyapi/__init__.py b/keyext.client.python/keyapi/__init__.py
similarity index 54%
rename from keyext.api/src/main/python/keyapi/__init__.py
rename to keyext.client.python/keyapi/__init__.py
index 8523f3801f5..4a913b39b2e 100644
--- a/keyext.api/src/main/python/keyapi/__init__.py
+++ b/keyext.client.python/keyapi/__init__.py
@@ -1,13 +1,4 @@
-from keyapi.rpc import JsonRPCHandler, Client
-
-
-class KeyClient(Client):
-    def __int__(self):
-        pass
-
-    def handle(self, res):
-        print(res)
-
+from keyapi.rpc import *
 
 class KeyStub(JsonRPCHandler):
     def __init__(self, input, output):
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
new file mode 100644
index 00000000000..02ba2be474b
--- /dev/null
+++ b/keyext.client.python/keyapi/rpc.py
@@ -0,0 +1,200 @@
+import enum
+import json
+import sys
+import threading
+from io import TextIOWrapper
+from typing import Dict
+
+JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
+LEN_HEADER = "Content-Length: "
+TYPE_HEADER = "Content-Type: "
+
+
+class MyEncoder(json.JSONEncoder):
+    """
+    Encodes an object in JSON
+    """
+
+    def default(self, o):  # pylint: disable=E0202
+        return o.__dict__
+
+
+class ResponseError(Exception):
+    def __init__(self, error_code, message):
+        super().__init__(message)
+        self.error_code = error_code
+
+
+class ErrorCodes(enum.Enum):
+    ParseError = 1
+
+
+class JsonRpcEndpoint(object):
+    '''
+    Thread safe JSON RPC endpoint implementation. Responsible to recieve and send JSON RPC messages, as described in the
+    protocol. More information can be found: https://www.jsonrpc.org/
+    '''
+
+    def __init__(self, stdin, stdout):
+        self.stdin = stdin
+        self.stdout = stdout
+        self.read_lock = threading.Lock()
+        self.write_lock = threading.Lock()
+
+    @staticmethod
+    def __add_header(json_string):
+        '''
+        Adds a header for the given json string
+
+        :param str json_string: The string
+        :return: the string with the header
+        '''
+        return JSON_RPC_REQ_FORMAT.format(json_string_len=len(json_string), json_string=json_string)
+
+    def send_request(self, message):
+        '''
+        Sends the given message.
+
+        :param dict message: The message to send.
+        '''
+        json_string = json.dumps(message, cls=MyEncoder)
+        jsonrpc_req = self.__add_header(json_string)
+        with self.write_lock:
+            self.stdin.write(jsonrpc_req.encode())
+            self.stdin.flush()
+
+    def recv_response(self):
+        '''
+        Recives a message.
+
+        :return: a message
+        '''
+        with self.read_lock:
+            message_size = None
+            while True:
+                # read header
+                line = self.stdout.readline()
+                if not line:
+                    # server quit
+                    return None
+                line = line.decode("utf-8")
+                if not line.endswith("\r\n"):
+                    raise ResponseError(ErrorCodes.ParseError, "Bad header: missing newline")
+                # remove the "\r\n"
+                line = line[:-2]
+                if line == "":
+                    # done with the headers
+                    break
+                elif line.startswith(LEN_HEADER):
+                    line = line[len(LEN_HEADER):]
+                    if not line.isdigit():
+                        raise ResponseError(ErrorCodes.ParseError,
+                                            "Bad header: size is not int")
+                    message_size = int(line)
+                elif line.startswith(TYPE_HEADER):
+                    # nothing todo with type for now.
+                    pass
+                else:
+                    raise ResponseError(ErrorCodes.ParseError, "Bad header: unkown header")
+            if not message_size:
+                raise ResponseError(ErrorCodes.ParseError, "Bad header: missing size")
+
+            jsonrpc_res = self.stdout.read(message_size).decode("utf-8")
+            return json.loads(jsonrpc_res)
+
+
+class LspEndpoint(threading.Thread):
+    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2):
+        super().__init__()
+        self.json_rpc_endpoint: JsonRpcEndpoint = json_rpc_endpoint
+        self.notify_callbacks: Dict = notify_callbacks or {}
+        self.method_callbacks: Dict = method_callbacks or {}
+        self.event_dict = {}
+        self.response_dict = {}
+        self.next_id = 0
+        self._timeout = timeout
+        self.shutdown_flag = False
+
+    def handle_result(self, rpc_id, result, error):
+        self.response_dict[rpc_id] = (result, error)
+        cond = self.event_dict[rpc_id]
+        cond.acquire()
+        cond.notify()
+        cond.release()
+
+    def stop(self):
+        self.shutdown_flag = True
+
+    def run(self):
+        while not self.shutdown_flag:
+            try:
+                jsonrpc_message = self.json_rpc_endpoint.recv_response()
+                if jsonrpc_message is None:
+                    print("server quit")
+                    break
+                method = jsonrpc_message.get("method")
+                result = jsonrpc_message.get("result")
+                error = jsonrpc_message.get("error")
+                rpc_id = jsonrpc_message.get("id")
+                params = jsonrpc_message.get("params")
+
+                if method:
+                    if rpc_id:
+                        # a call for method
+                        if method not in self.method_callbacks:
+                            raise ResponseError(ErrorCodes.MethodNotFound,
+                                                "Method not found: {method}".format(method=method))
+                        result = self.method_callbacks[method](params)
+                        self.send_response(rpc_id, result, None)
+                    else:
+                        # a call for notify
+                        if method not in self.notify_callbacks:
+                            # Have nothing to do with this.
+                            print("Notify method not found: {method}.".format(method=method))
+                        else:
+                            self.notify_callbacks[method](params)
+                else:
+                    self.handle_result(rpc_id, result, error)
+            except ResponseError as e:
+                self.send_response(rpc_id, None, e)
+
+    def send_response(self, id, result, error):
+        message_dict = {"jsonrpc": "2.0", "id": id}
+        if result:
+            message_dict["result"] = result
+        if error:
+            message_dict["error"] = error
+        self.json_rpc_endpoint.send_request(message_dict)
+
+    def send_message(self, method_name, params, id=None):
+        message_dict = {}
+        message_dict["jsonrpc"] = "2.0"
+        if id is not None:
+            message_dict["id"] = id
+        message_dict["method"] = method_name
+        message_dict["params"] = params
+        self.json_rpc_endpoint.send_request(message_dict)
+
+    def call_method(self, method_name, **kwargs):
+        current_id = self.next_id
+        self.next_id += 1
+        cond = threading.Condition()
+        self.event_dict[current_id] = cond
+
+        cond.acquire()
+        self.send_message(method_name, kwargs, current_id)
+        if self.shutdown_flag:
+            return None
+
+        if not cond.wait(timeout=self._timeout):
+            raise TimeoutError()
+        cond.release()
+
+        self.event_dict.pop(current_id)
+        result, error = self.response_dict.pop(current_id)
+        if error:
+            raise ResponseError(error.get("code"), error.get("message"), error.get("data"))
+        return result
+
+    def send_notification(self, method_name, **kwargs):
+        self.send_message(method_name, kwargs)
diff --git a/keyext.api/src/main/python/main.py b/keyext.client.python/main.py
similarity index 100%
rename from keyext.api/src/main/python/main.py
rename to keyext.client.python/main.py
diff --git a/keyext.client.python/rwtest.py b/keyext.client.python/rwtest.py
new file mode 100644
index 00000000000..312532192dc
--- /dev/null
+++ b/keyext.client.python/rwtest.py
@@ -0,0 +1,402 @@
+import enum
+import abc
+import typing
+from abc import abstractmethod
+
+
+class ExampleDesc:
+    """"""
+
+    name: str
+    description: str
+
+
+class ProofScriptCommandDesc:
+    """"""
+
+
+class ProofMacroDesc:
+    """"""
+
+    name: str
+    category: str
+    description: str
+    scriptCommandName: str
+
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+
+class SetTraceParams:
+    """"""
+
+    value: TraceValue
+
+
+class EnvironmentId:
+    """"""
+
+    envId: str
+
+
+class ProofId:
+    """"""
+
+    env: EnvironmentId
+    proofId: str
+
+
+class TreeNodeDesc:
+    """"""
+
+
+class TreeNodeId:
+    """"""
+
+    id: str
+
+
+class NodeId:
+    """"""
+
+    proofId: ProofId
+    nodeId: int
+
+
+class PrintOptions:
+    """"""
+
+    unicode: bool
+    width: int
+    indentation: int
+    pure: bool
+    termLabels: bool
+
+
+class NodeTextId:
+    """"""
+
+    nodeId: NodeId
+    nodeTextId: int
+
+
+class NodeTextDesc:
+    """"""
+
+    id: NodeTextId
+    result: str
+
+
+class TermActionId:
+    """"""
+
+    nodeId: NodeId
+    pio: str
+    id: str
+
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+
+class TermActionDesc:
+    """"""
+
+    commandId: TermActionId
+    displayName: str
+    description: str
+    category: str
+    kind: TermActionKind
+
+
+class List:
+    """"""
+
+
+class SortDesc:
+    """"""
+
+    string: str
+    documentation: str
+    extendsSorts: List
+    anAbstract: bool
+    s: str
+
+
+class FunctionDesc:
+    """"""
+
+    name: str
+    sort: str
+    retSort: SortDesc
+    argSorts: List
+    rigid: bool
+    unique: bool
+    skolemConstant: bool
+
+
+class ContractId:
+    """"""
+
+    envId: EnvironmentId
+    contractId: int
+
+
+class ContractDesc:
+    """"""
+
+    contractId: ContractId
+    name: str
+    displayName: str
+    typeName: str
+    htmlText: str
+    plainText: str
+
+
+class LoadParams:
+    """"""
+
+    keyFile: str
+    javaFile: str
+    classPath: List
+    bootClassPath: str
+    includes: List
+
+
+class ProblemDefinition:
+    """"""
+
+    sorts: List
+    functions: List
+    predicates: List
+    antecTerms: List
+    succTerms: List
+
+
+class LogTraceParams:
+    """"""
+
+    messag: str
+    verbose: str
+
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+
+class ShowMessageParams:
+    """"""
+
+    type: MessageType
+    message: str
+
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type: MessageType
+    message: str
+    actions: typing.List[MessageActionItem]
+
+
+class MessageActionItem:
+    """"""
+
+    title: str
+
+
+class Range:
+    """"""
+
+    start: int
+    end: int
+
+
+class ShowDocumentParams:
+    """"""
+
+    uri: str
+    external: bool
+    takeFocus: bool
+    selection: Range
+
+
+class ShowDocumentResult:
+    """"""
+
+    success: bool
+
+
+class TaskFinishedInfo:
+    """"""
+
+
+class TaskStartedInfo:
+    """"""
+
+
+class KeyServer():
+    def env_contracts(self, arg0: EnvironmentId) -> typing.List[ContractDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/contracts", )
+
+    def env_functions(self, arg0: EnvironmentId) -> typing.List[FunctionDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/functions", )
+
+    def env_openContract(self, arg0: ContractId) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("env/openContract", )
+
+    def env_sorts(self, arg0: EnvironmentId) -> typing.List[SortDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/sorts", )
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+        """"""
+
+        return self.rpc.call_sync("examples/list", )
+
+    def goal_actions(self, arg0: NodeTextId, arg1: int) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self.rpc.call_sync("goal/actions", )
+
+    def goal_apply_action(self, arg0: TermActionId) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self.rpc.call_sync("goal/apply_action", )
+
+    def goal_free(self, arg0: NodeTextId):
+        """"""
+
+        return self.rpc.call_async("goal/free", )
+
+    def goal_print(self, arg0: NodeId, arg1: PrintOptions) -> NodeTextDesc:
+        """"""
+
+        return self.rpc.call_sync("goal/print", )
+
+    def loading_load(self, arg0: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+        """"""
+
+        return self.rpc.call_sync("loading/load", )
+
+    def loading_loadExample(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadExample", )
+
+    def loading_loadKey(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadKey", )
+
+    def loading_loadProblem(self, arg0: ProblemDefinition) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadProblem", )
+
+    def loading_loadTerm(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadTerm", )
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+        """"""
+
+        return self.rpc.call_sync("meta/available_macros", )
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+        """"""
+
+        return self.rpc.call_sync("meta/available_script_commands", )
+
+    def meta_version(self, ) -> str:
+        """"""
+
+        return self.rpc.call_sync("meta/version", )
+
+    def proofTree_children(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self.rpc.call_sync("proofTree/children", )
+
+    def proofTree_root(self, arg0: ProofId) -> TreeNodeDesc:
+        """"""
+
+        return self.rpc.call_sync("proofTree/root", )
+
+    def proofTree_subtree(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self.rpc.call_sync("proofTree/subtree", )
+
+    def server_exit(self, ):
+        """"""
+
+        return self.rpc.call_async("server/exit", )
+
+    def server_setTrace(self, arg0: SetTraceParams):
+        """"""
+
+        return self.rpc.call_async("server/setTrace", )
+
+    def server_shutdown(self, ) -> bool:
+        """"""
+
+        return self.rpc.call_sync("server/shutdown", )
+
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, arg0: LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, arg0: str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, arg0: ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, arg0: ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, arg0: ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass

From c7000129b0190dbcaa4c388ed6b91b38cd12f095 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Wed, 1 Nov 2023 15:52:40 +0100
Subject: [PATCH 07/50] running for primitive data types, somethings wrong in
 de-/serialization

---
 api.meta.json                                 | 445 +++++++++------
 api.meta.md                                   |  53 +-
 api.py                                        | 374 ------------
 keydata.py                                    | 493 ++++++++++++++++
 .../src/main/java/ExtractMetaData.java        |  25 +-
 keyext.api.doc/src/main/java/Metamodel.java   |   7 +-
 keyext.api.doc/src/main/java/PyGen.java       | 136 -----
 .../src/main/java/PythionGenerator.java       | 223 ++++++++
 keyext.api/build.gradle                       |   1 +
 .../keyproject/key/api/GenericSerializer.java |  56 ++
 .../org/keyproject/key/api/KeyApiImpl.java    |   3 +-
 .../org/keyproject/key/api/StartServer.java   |   7 +-
 .../key/api/adapters/KeyAdapter.java          |   2 +-
 .../ShowMessageRequestParams.java             |   4 +-
 keyext.client.python/keyapi/__init__.py       |  12 +-
 keyext.client.python/keyapi/keydata.py        | 533 ++++++++++++++++++
 keyext.client.python/keyapi/rpc.py            |  58 +-
 keyext.client.python/keyapi/server.py         | 161 ++++++
 keyext.client.python/main.py                  |  22 +-
 keyext.client.python/rwtest.py                | 402 -------------
 server.py                                     | 159 ++++++
 21 files changed, 2023 insertions(+), 1153 deletions(-)
 delete mode 100644 api.py
 create mode 100644 keydata.py
 delete mode 100644 keyext.api.doc/src/main/java/PyGen.java
 create mode 100644 keyext.api.doc/src/main/java/PythionGenerator.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
 create mode 100644 keyext.client.python/keyapi/keydata.py
 create mode 100644 keyext.client.python/keyapi/server.py
 delete mode 100644 keyext.client.python/rwtest.py
 create mode 100644 server.py

diff --git a/api.meta.json b/api.meta.json
index 180b16a3019..953b76c6088 100644
--- a/api.meta.json
+++ b/api.meta.json
@@ -10,11 +10,13 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -51,19 +53,23 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "scriptCommandName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -87,7 +93,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "SetTraceParams"
         }
       ]
@@ -97,7 +103,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "ProofId"
         }
       ],
@@ -112,11 +118,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "proof",
           "type": "ProofId"
         },
         {
-          "name": "arg1",
+          "name": "nodeId",
           "type": "TreeNodeId"
         }
       ],
@@ -134,11 +140,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "proof",
           "type": "ProofId"
         },
         {
-          "name": "arg1",
+          "name": "nodeId",
           "type": "TreeNodeId"
         }
       ],
@@ -156,11 +162,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeId"
         },
         {
-          "name": "arg1",
+          "name": "options",
           "type": "PrintOptions"
         }
       ],
@@ -169,11 +175,13 @@
         "fields": [
           {
             "name": "id",
-            "type": "NodeTextId"
+            "type": "NodeTextId",
+            "documentation": ""
           },
           {
             "name": "result",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -184,11 +192,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeTextId"
         },
         {
-          "name": "arg1",
+          "name": "pos",
           "type": "INT"
         }
       ],
@@ -198,23 +206,28 @@
           "fields": [
             {
               "name": "commandId",
-              "type": "TermActionId"
+              "type": "TermActionId",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "kind",
-              "type": "TermActionKind"
+              "type": "TermActionKind",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -227,7 +240,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "TermActionId"
         }
       ],
@@ -237,23 +250,28 @@
           "fields": [
             {
               "name": "commandId",
-              "type": "TermActionId"
+              "type": "TermActionId",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "kind",
-              "type": "TermActionKind"
+              "type": "TermActionKind",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -266,7 +284,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeTextId"
         }
       ]
@@ -276,7 +294,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -286,31 +304,38 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "sort",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "retSort",
-              "type": "SortDesc"
+              "type": "SortDesc",
+              "documentation": ""
             },
             {
               "name": "argSorts",
-              "type": "List"
+              "type": "List",
+              "documentation": ""
             },
             {
               "name": "rigid",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "unique",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "skolemConstant",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -323,7 +348,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -333,23 +358,28 @@
           "fields": [
             {
               "name": "string",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "documentation",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "extendsSorts",
-              "type": "List"
+              "type": "List",
+              "documentation": ""
             },
             {
               "name": "anAbstract",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "s",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -362,7 +392,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -372,27 +402,33 @@
           "fields": [
             {
               "name": "contractId",
-              "type": "ContractId"
+              "type": "ContractId",
+              "documentation": ""
             },
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "typeName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "htmlText",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "plainText",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -405,7 +441,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "contractId",
           "type": "ContractId"
         }
       ],
@@ -414,11 +450,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -429,7 +467,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "LoadParams"
         }
       ],
@@ -439,7 +477,8 @@
           "fields": [
             {
               "name": "envId",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -449,11 +488,13 @@
           "fields": [
             {
               "name": "env",
-              "type": "EnvironmentId"
+              "type": "EnvironmentId",
+              "documentation": ""
             },
             {
               "name": "proofId",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -462,11 +503,11 @@
       }
     },
     {
-      "name": "loading/loadKey",
+      "name": "loading/loadExample",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "STRING"
         }
       ],
@@ -475,23 +516,25 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
       }
     },
     {
-      "name": "loading/loadExample",
+      "name": "loading/loadProblem",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
-          "type": "STRING"
+          "name": "problem",
+          "type": "ProblemDefinition"
         }
       ],
       "returnType": {
@@ -499,23 +542,25 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
       }
     },
     {
-      "name": "loading/loadProblem",
+      "name": "loading/loadKey",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
-          "type": "ProblemDefinition"
+          "name": "content",
+          "type": "STRING"
         }
       ],
       "returnType": {
@@ -523,11 +568,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -538,7 +585,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "term",
           "type": "STRING"
         }
       ],
@@ -547,11 +594,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -562,7 +611,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "e",
           "type": "STRING"
         }
       ]
@@ -572,7 +621,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "LogTraceParams"
         }
       ]
@@ -582,7 +631,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowMessageParams"
         }
       ]
@@ -592,7 +641,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowMessageRequestParams"
         }
       ],
@@ -601,7 +650,8 @@
         "fields": [
           {
             "name": "title",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -612,7 +662,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowDocumentParams"
         }
       ],
@@ -621,7 +671,8 @@
         "fields": [
           {
             "name": "success",
-            "type": "BOOL"
+            "type": "BOOL",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -634,11 +685,13 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -653,19 +706,23 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "category",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "scriptCommandName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -684,7 +741,8 @@
       "fields": [
         {
           "name": "value",
-          "type": "TraceValue"
+          "type": "TraceValue",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -694,7 +752,8 @@
       "fields": [
         {
           "name": "envId",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -704,11 +763,13 @@
       "fields": [
         {
           "name": "env",
-          "type": "EnvironmentId"
+          "type": "EnvironmentId",
+          "documentation": ""
         },
         {
           "name": "proofId",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -723,7 +784,8 @@
       "fields": [
         {
           "name": "id",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -733,11 +795,13 @@
       "fields": [
         {
           "name": "proofId",
-          "type": "ProofId"
+          "type": "ProofId",
+          "documentation": ""
         },
         {
           "name": "nodeId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -747,23 +811,28 @@
       "fields": [
         {
           "name": "unicode",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "width",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "indentation",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "pure",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "termLabels",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -773,11 +842,13 @@
       "fields": [
         {
           "name": "nodeId",
-          "type": "NodeId"
+          "type": "NodeId",
+          "documentation": ""
         },
         {
           "name": "nodeTextId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -787,11 +858,13 @@
       "fields": [
         {
           "name": "id",
-          "type": "NodeTextId"
+          "type": "NodeTextId",
+          "documentation": ""
         },
         {
           "name": "result",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -801,15 +874,18 @@
       "fields": [
         {
           "name": "nodeId",
-          "type": "NodeId"
+          "type": "NodeId",
+          "documentation": ""
         },
         {
           "name": "pio",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "id",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -829,23 +905,28 @@
       "fields": [
         {
           "name": "commandId",
-          "type": "TermActionId"
+          "type": "TermActionId",
+          "documentation": ""
         },
         {
           "name": "displayName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "category",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "kind",
-          "type": "TermActionKind"
+          "type": "TermActionKind",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -860,23 +941,28 @@
       "fields": [
         {
           "name": "string",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "documentation",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "extendsSorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "anAbstract",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "s",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -886,31 +972,38 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "sort",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "retSort",
-          "type": "SortDesc"
+          "type": "SortDesc",
+          "documentation": ""
         },
         {
           "name": "argSorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "rigid",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "unique",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "skolemConstant",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -920,11 +1013,13 @@
       "fields": [
         {
           "name": "envId",
-          "type": "EnvironmentId"
+          "type": "EnvironmentId",
+          "documentation": ""
         },
         {
           "name": "contractId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -934,27 +1029,33 @@
       "fields": [
         {
           "name": "contractId",
-          "type": "ContractId"
+          "type": "ContractId",
+          "documentation": ""
         },
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "displayName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "typeName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "htmlText",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "plainText",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -964,23 +1065,28 @@
       "fields": [
         {
           "name": "keyFile",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "javaFile",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "classPath",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "bootClassPath",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "includes",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -990,23 +1096,28 @@
       "fields": [
         {
           "name": "sorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "functions",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "predicates",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "antecTerms",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "succTerms",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1016,11 +1127,13 @@
       "fields": [
         {
           "name": "messag",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "verbose",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1042,34 +1155,34 @@
       "fields": [
         {
           "name": "type",
-          "type": "MessageType"
+          "type": "MessageType",
+          "documentation": ""
         },
         {
           "name": "message",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
     },
-    {
-      "typeName": "MessageActionItem[]",
-      "fields": [],
-      "documentation": ""
-    },
     {
       "typeName": "ShowMessageRequestParams",
       "fields": [
         {
           "name": "type",
-          "type": "MessageType"
+          "type": "MessageType",
+          "documentation": ""
         },
         {
           "name": "message",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "actions",
-          "type": "MessageActionItem[]"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1079,7 +1192,8 @@
       "fields": [
         {
           "name": "title",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1089,11 +1203,13 @@
       "fields": [
         {
           "name": "start",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "end",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1103,19 +1219,23 @@
       "fields": [
         {
           "name": "uri",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "external",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "takeFocus",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "selection",
-          "type": "Range"
+          "type": "Range",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1125,7 +1245,8 @@
       "fields": [
         {
           "name": "success",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
diff --git a/api.meta.md b/api.meta.md
index f53d88619f3..f6d7a29c764 100644
--- a/api.meta.md
+++ b/api.meta.md
@@ -80,13 +80,6 @@ type MessageActionItem {
 }
 ```
 
-### Type: MessageActionItem[]
-```
-type MessageActionItem[] {
- 
-}
-```
-
 ### Type: MessageType
 ```
 enum MessageType { Unused, Error, Warning, Info, Log, Debug }
@@ -206,7 +199,7 @@ type ShowMessageParams {
 ### Type: ShowMessageRequestParams
 ```
 type ShowMessageRequestParams {
- 	actions : MessageActionItem[]
+ 	actions : List
 	message : STRING
 	type : MessageType
 }
@@ -285,63 +278,63 @@ type TreeNodeId {
 ### client/logTrace (`server ~~> client`) 
 
 ```
-Client.client/logTrace( arg0 : LogTraceParams ) **async**
+Client.client/logTrace( params : LogTraceParams ) **async**
 ```
 
 
 ### client/sayHello (`server ~~> client`) 
 
 ```
-Client.client/sayHello( arg0 : STRING ) **async**
+Client.client/sayHello( e : STRING ) **async**
 ```
 
 
 ### client/showDocument (`server -> client`) 
 
 ```
-Client.client/showDocument( arg0 : ShowDocumentParams ) -> ShowDocumentResult
+Client.client/showDocument( params : ShowDocumentParams ) -> ShowDocumentResult
 ```
 
 
 ### client/sm (`server ~~> client`) 
 
 ```
-Client.client/sm( arg0 : ShowMessageParams ) **async**
+Client.client/sm( params : ShowMessageParams ) **async**
 ```
 
 
 ### client/userResponse (`server -> client`) 
 
 ```
-Client.client/userResponse( arg0 : ShowMessageRequestParams ) -> MessageActionItem
+Client.client/userResponse( params : ShowMessageRequestParams ) -> MessageActionItem
 ```
 
 
 ### env/contracts (`client -> server`) 
 
 ```
-Server.env/contracts( arg0 : EnvironmentId ) -> ContractDesc[]
+Server.env/contracts( env : EnvironmentId ) -> ContractDesc[]
 ```
 
 
 ### env/functions (`client -> server`) 
 
 ```
-Server.env/functions( arg0 : EnvironmentId ) -> FunctionDesc[]
+Server.env/functions( env : EnvironmentId ) -> FunctionDesc[]
 ```
 
 
 ### env/openContract (`client -> server`) 
 
 ```
-Server.env/openContract( arg0 : ContractId ) -> ProofId
+Server.env/openContract( contractId : ContractId ) -> ProofId
 ```
 
 
 ### env/sorts (`client -> server`) 
 
 ```
-Server.env/sorts( arg0 : EnvironmentId ) -> SortDesc[]
+Server.env/sorts( env : EnvironmentId ) -> SortDesc[]
 ```
 
 
@@ -355,63 +348,63 @@ Server.examples/list(  ) -> ExampleDesc[]
 ### goal/actions (`client -> server`) 
 
 ```
-Server.goal/actions( arg0 : NodeTextId, arg1 : INT ) -> TermActionDesc[]
+Server.goal/actions( id : NodeTextId, pos : INT ) -> TermActionDesc[]
 ```
 
 
 ### goal/apply_action (`client -> server`) 
 
 ```
-Server.goal/apply_action( arg0 : TermActionId ) -> TermActionDesc[]
+Server.goal/apply_action( id : TermActionId ) -> TermActionDesc[]
 ```
 
 
 ### goal/free (`client ~~> server`) 
 
 ```
-Server.goal/free( arg0 : NodeTextId ) **async**
+Server.goal/free( id : NodeTextId ) **async**
 ```
 
 
 ### goal/print (`client -> server`) 
 
 ```
-Server.goal/print( arg0 : NodeId, arg1 : PrintOptions ) -> NodeTextDesc
+Server.goal/print( id : NodeId, options : PrintOptions ) -> NodeTextDesc
 ```
 
 
 ### loading/load (`client -> server`) 
 
 ```
-Server.loading/load( arg0 : LoadParams ) -> either<a,b>
+Server.loading/load( params : LoadParams ) -> either<a,b>
 ```
 
 
 ### loading/loadExample (`client -> server`) 
 
 ```
-Server.loading/loadExample( arg0 : STRING ) -> ProofId
+Server.loading/loadExample( id : STRING ) -> ProofId
 ```
 
 
 ### loading/loadKey (`client -> server`) 
 
 ```
-Server.loading/loadKey( arg0 : STRING ) -> ProofId
+Server.loading/loadKey( content : STRING ) -> ProofId
 ```
 
 
 ### loading/loadProblem (`client -> server`) 
 
 ```
-Server.loading/loadProblem( arg0 : ProblemDefinition ) -> ProofId
+Server.loading/loadProblem( problem : ProblemDefinition ) -> ProofId
 ```
 
 
 ### loading/loadTerm (`client -> server`) 
 
 ```
-Server.loading/loadTerm( arg0 : STRING ) -> ProofId
+Server.loading/loadTerm( term : STRING ) -> ProofId
 ```
 
 
@@ -439,21 +432,21 @@ Server.meta/version(  ) -> STRING
 ### proofTree/children (`client -> server`) 
 
 ```
-Server.proofTree/children( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+Server.proofTree/children( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
 ```
 
 
 ### proofTree/root (`client -> server`) 
 
 ```
-Server.proofTree/root( arg0 : ProofId ) -> TreeNodeDesc
+Server.proofTree/root( id : ProofId ) -> TreeNodeDesc
 ```
 
 
 ### proofTree/subtree (`client -> server`) 
 
 ```
-Server.proofTree/subtree( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+Server.proofTree/subtree( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
 ```
 
 
@@ -467,7 +460,7 @@ Server.server/exit(  ) **async**
 ### server/setTrace (`client ~~> server`) 
 
 ```
-Server.server/setTrace( arg0 : SetTraceParams ) **async**
+Server.server/setTrace( params : SetTraceParams ) **async**
 ```
 
 
diff --git a/api.py b/api.py
deleted file mode 100644
index c83050a763e..00000000000
--- a/api.py
+++ /dev/null
@@ -1,374 +0,0 @@
-import enum
-import abc
-import typing
-class ExampleDesc:
-    """"""
-
-    name : str
-    description : str
-
-class ProofScriptCommandDesc:
-    """"""
-
-
-class ProofMacroDesc:
-    """"""
-
-    name : str
-    category : str
-    description : str
-    scriptCommandName : str
-
-class TraceValue(enum.Enum):
-    """"""
-
-    Off = None
-    Message = None
-    All = None
-
-class SetTraceParams:
-    """"""
-
-    value : TraceValue
-
-class EnvironmentId:
-    """"""
-
-    envId : str
-
-class ProofId:
-    """"""
-
-    env : EnvironmentId
-    proofId : str
-
-class TreeNodeDesc:
-    """"""
-
-
-class TreeNodeId:
-    """"""
-
-    id : str
-
-class NodeId:
-    """"""
-
-    proofId : ProofId
-    nodeId : int
-
-class PrintOptions:
-    """"""
-
-    unicode : bool
-    width : int
-    indentation : int
-    pure : bool
-    termLabels : bool
-
-class NodeTextId:
-    """"""
-
-    nodeId : NodeId
-    nodeTextId : int
-
-class NodeTextDesc:
-    """"""
-
-    id : NodeTextId
-    result : str
-
-class TermActionId:
-    """"""
-
-    nodeId : NodeId
-    pio : str
-    id : str
-
-class TermActionKind(enum.Enum):
-    """"""
-
-    BuiltIn = None
-    Script = None
-    Macro = None
-    Taclet = None
-
-class TermActionDesc:
-    """"""
-
-    commandId : TermActionId
-    displayName : str
-    description : str
-    category : str
-    kind : TermActionKind
-
-class List:
-    """"""
-
-
-class SortDesc:
-    """"""
-
-    string : str
-    documentation : str
-    extendsSorts : List
-    anAbstract : bool
-    s : str
-
-class FunctionDesc:
-    """"""
-
-    name : str
-    sort : str
-    retSort : SortDesc
-    argSorts : List
-    rigid : bool
-    unique : bool
-    skolemConstant : bool
-
-class ContractId:
-    """"""
-
-    envId : EnvironmentId
-    contractId : int
-
-class ContractDesc:
-    """"""
-
-    contractId : ContractId
-    name : str
-    displayName : str
-    typeName : str
-    htmlText : str
-    plainText : str
-
-class LoadParams:
-    """"""
-
-    keyFile : str
-    javaFile : str
-    classPath : List
-    bootClassPath : str
-    includes : List
-
-class ProblemDefinition:
-    """"""
-
-    sorts : List
-    functions : List
-    predicates : List
-    antecTerms : List
-    succTerms : List
-
-class LogTraceParams:
-    """"""
-
-    messag : str
-    verbose : str
-
-class MessageType(enum.Enum):
-    """"""
-
-    Unused = None
-    Error = None
-    Warning = None
-    Info = None
-    Log = None
-    Debug = None
-
-class ShowMessageParams:
-    """"""
-
-    type : MessageType
-    message : str
-
-class MessageActionItem[]:
-    """"""
-
-
-class ShowMessageRequestParams:
-    """"""
-
-    type : MessageType
-    message : str
-    actions : MessageActionItem[]
-
-class MessageActionItem:
-    """"""
-
-    title : str
-
-class Range:
-    """"""
-
-    start : int
-    end : int
-
-class ShowDocumentParams:
-    """"""
-
-    uri : str
-    external : bool
-    takeFocus : bool
-    selection : Range
-
-class ShowDocumentResult:
-    """"""
-
-    success : bool
-
-class TaskFinishedInfo:
-    """"""
-
-
-class TaskStartedInfo:
-    """"""
-
-
-class KeyServer():
-    def env_contracts(self, arg0 : EnvironmentId) -> typing.List[ContractDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/contracts", )
-
-    def env_functions(self, arg0 : EnvironmentId) -> typing.List[FunctionDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/functions", )
-
-    def env_openContract(self, arg0 : ContractId) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("env/openContract", )
-
-    def env_sorts(self, arg0 : EnvironmentId) -> typing.List[SortDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/sorts", )
-
-    def examples_list(self, ) -> typing.List[ExampleDesc]:
-       """"""
-
-       return self.rpc.call_sync("examples/list", )
-
-    def goal_actions(self, arg0 : NodeTextId, arg1 : int) -> typing.List[TermActionDesc]:
-       """"""
-
-       return self.rpc.call_sync("goal/actions", )
-
-    def goal_apply_action(self, arg0 : TermActionId) -> typing.List[TermActionDesc]:
-       """"""
-
-       return self.rpc.call_sync("goal/apply_action", )
-
-    def goal_free(self, arg0 : NodeTextId):
-        """"""
-
-        return self.rpc.call_async("goal/free", )
-
-    def goal_print(self, arg0 : NodeId, arg1 : PrintOptions) -> NodeTextDesc:
-       """"""
-
-       return self.rpc.call_sync("goal/print", )
-
-    def loading_load(self, arg0 : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
-       """"""
-
-       return self.rpc.call_sync("loading/load", )
-
-    def loading_loadExample(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadExample", )
-
-    def loading_loadKey(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadKey", )
-
-    def loading_loadProblem(self, arg0 : ProblemDefinition) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadProblem", )
-
-    def loading_loadTerm(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadTerm", )
-
-    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
-       """"""
-
-       return self.rpc.call_sync("meta/available_macros", )
-
-    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
-       """"""
-
-       return self.rpc.call_sync("meta/available_script_commands", )
-
-    def meta_version(self, ) -> STRING:
-       """"""
-
-       return self.rpc.call_sync("meta/version", )
-
-    def proofTree_children(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
-       """"""
-
-       return self.rpc.call_sync("proofTree/children", )
-
-    def proofTree_root(self, arg0 : ProofId) -> TreeNodeDesc:
-       """"""
-
-       return self.rpc.call_sync("proofTree/root", )
-
-    def proofTree_subtree(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
-       """"""
-
-       return self.rpc.call_sync("proofTree/subtree", )
-
-    def server_exit(self, ):
-        """"""
-
-        return self.rpc.call_async("server/exit", )
-
-    def server_setTrace(self, arg0 : SetTraceParams):
-        """"""
-
-        return self.rpc.call_async("server/setTrace", )
-
-    def server_shutdown(self, ) -> BOOL:
-       """"""
-
-       return self.rpc.call_sync("server/shutdown", )
-
-class Client(abc.AbcMeta):
-    @abstractmethod
-    def client_logTrace(self, arg0 : LogTraceParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sayHello(self, arg0 : str):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_showDocument(self, arg0 : ShowDocumentParams) -> ShowDocumentResult:
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sm(self, arg0 : ShowMessageParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_userResponse(self, arg0 : ShowMessageRequestParams) -> MessageActionItem:
-        """"""
-
-        pass
-
diff --git a/keydata.py b/keydata.py
new file mode 100644
index 00000000000..59511c2a7a8
--- /dev/null
+++ b/keydata.py
@@ -0,0 +1,493 @@
+from __future__ import annotations
+import enum
+import abc
+import typing
+from abc import abstractmethod, ABCMeta
+
+class ExampleDesc:
+    """"""
+
+    name : str
+    """"""
+
+    description : str
+    """"""
+
+    def __init__(self, name, description):
+        self.name = name
+        self.description = description
+
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class ProofMacroDesc:
+    """"""
+
+    name : str
+    """"""
+
+    category : str
+    """"""
+
+    description : str
+    """"""
+
+    scriptCommandName : str
+    """"""
+
+    def __init__(self, name, category, description, scriptCommandName):
+        self.name = name
+        self.category = category
+        self.description = description
+        self.scriptCommandName = scriptCommandName
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+class SetTraceParams:
+    """"""
+
+    value : TraceValue
+    """"""
+
+    def __init__(self, value):
+        self.value = value
+
+class EnvironmentId:
+    """"""
+
+    envId : str
+    """"""
+
+    def __init__(self, envId):
+        self.envId = envId
+
+class ProofId:
+    """"""
+
+    env : EnvironmentId
+    """"""
+
+    proofId : str
+    """"""
+
+    def __init__(self, env, proofId):
+        self.env = env
+        self.proofId = proofId
+
+class TreeNodeDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TreeNodeId:
+    """"""
+
+    id : str
+    """"""
+
+    def __init__(self, id):
+        self.id = id
+
+class NodeId:
+    """"""
+
+    proofId : ProofId
+    """"""
+
+    nodeId : int
+    """"""
+
+    def __init__(self, proofId, nodeId):
+        self.proofId = proofId
+        self.nodeId = nodeId
+
+class PrintOptions:
+    """"""
+
+    unicode : bool
+    """"""
+
+    width : int
+    """"""
+
+    indentation : int
+    """"""
+
+    pure : bool
+    """"""
+
+    termLabels : bool
+    """"""
+
+    def __init__(self, unicode, width, indentation, pure, termLabels):
+        self.unicode = unicode
+        self.width = width
+        self.indentation = indentation
+        self.pure = pure
+        self.termLabels = termLabels
+
+class NodeTextId:
+    """"""
+
+    nodeId : NodeId
+    """"""
+
+    nodeTextId : int
+    """"""
+
+    def __init__(self, nodeId, nodeTextId):
+        self.nodeId = nodeId
+        self.nodeTextId = nodeTextId
+
+class NodeTextDesc:
+    """"""
+
+    id : NodeTextId
+    """"""
+
+    result : str
+    """"""
+
+    def __init__(self, id, result):
+        self.id = id
+        self.result = result
+
+class TermActionId:
+    """"""
+
+    nodeId : NodeId
+    """"""
+
+    pio : str
+    """"""
+
+    id : str
+    """"""
+
+    def __init__(self, nodeId, pio, id):
+        self.nodeId = nodeId
+        self.pio = pio
+        self.id = id
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+class TermActionDesc:
+    """"""
+
+    commandId : TermActionId
+    """"""
+
+    displayName : str
+    """"""
+
+    description : str
+    """"""
+
+    category : str
+    """"""
+
+    kind : TermActionKind
+    """"""
+
+    def __init__(self, commandId, displayName, description, category, kind):
+        self.commandId = commandId
+        self.displayName = displayName
+        self.description = description
+        self.category = category
+        self.kind = kind
+
+class List:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class SortDesc:
+    """"""
+
+    string : str
+    """"""
+
+    documentation : str
+    """"""
+
+    extendsSorts : List
+    """"""
+
+    anAbstract : bool
+    """"""
+
+    s : str
+    """"""
+
+    def __init__(self, string, documentation, extendsSorts, anAbstract, s):
+        self.string = string
+        self.documentation = documentation
+        self.extendsSorts = extendsSorts
+        self.anAbstract = anAbstract
+        self.s = s
+
+class FunctionDesc:
+    """"""
+
+    name : str
+    """"""
+
+    sort : str
+    """"""
+
+    retSort : SortDesc
+    """"""
+
+    argSorts : List
+    """"""
+
+    rigid : bool
+    """"""
+
+    unique : bool
+    """"""
+
+    skolemConstant : bool
+    """"""
+
+    def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant):
+        self.name = name
+        self.sort = sort
+        self.retSort = retSort
+        self.argSorts = argSorts
+        self.rigid = rigid
+        self.unique = unique
+        self.skolemConstant = skolemConstant
+
+class ContractId:
+    """"""
+
+    envId : EnvironmentId
+    """"""
+
+    contractId : int
+    """"""
+
+    def __init__(self, envId, contractId):
+        self.envId = envId
+        self.contractId = contractId
+
+class ContractDesc:
+    """"""
+
+    contractId : ContractId
+    """"""
+
+    name : str
+    """"""
+
+    displayName : str
+    """"""
+
+    typeName : str
+    """"""
+
+    htmlText : str
+    """"""
+
+    plainText : str
+    """"""
+
+    def __init__(self, contractId, name, displayName, typeName, htmlText, plainText):
+        self.contractId = contractId
+        self.name = name
+        self.displayName = displayName
+        self.typeName = typeName
+        self.htmlText = htmlText
+        self.plainText = plainText
+
+class LoadParams:
+    """"""
+
+    keyFile : str
+    """"""
+
+    javaFile : str
+    """"""
+
+    classPath : List
+    """"""
+
+    bootClassPath : str
+    """"""
+
+    includes : List
+    """"""
+
+    def __init__(self, keyFile, javaFile, classPath, bootClassPath, includes):
+        self.keyFile = keyFile
+        self.javaFile = javaFile
+        self.classPath = classPath
+        self.bootClassPath = bootClassPath
+        self.includes = includes
+
+class ProblemDefinition:
+    """"""
+
+    sorts : List
+    """"""
+
+    functions : List
+    """"""
+
+    predicates : List
+    """"""
+
+    antecTerms : List
+    """"""
+
+    succTerms : List
+    """"""
+
+    def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
+        self.sorts = sorts
+        self.functions = functions
+        self.predicates = predicates
+        self.antecTerms = antecTerms
+        self.succTerms = succTerms
+
+class LogTraceParams:
+    """"""
+
+    messag : str
+    """"""
+
+    verbose : str
+    """"""
+
+    def __init__(self, messag, verbose):
+        self.messag = messag
+        self.verbose = verbose
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+class ShowMessageParams:
+    """"""
+
+    type : MessageType
+    """"""
+
+    message : str
+    """"""
+
+    def __init__(self, type, message):
+        self.type = type
+        self.message = message
+
+class ShowMessageRequestParams:
+    """"""
+
+    type : MessageType
+    """"""
+
+    message : str
+    """"""
+
+    actions : List
+    """"""
+
+    def __init__(self, type, message, actions):
+        self.type = type
+        self.message = message
+        self.actions = actions
+
+class MessageActionItem:
+    """"""
+
+    title : str
+    """"""
+
+    def __init__(self, title):
+        self.title = title
+
+class Range:
+    """"""
+
+    start : int
+    """"""
+
+    end : int
+    """"""
+
+    def __init__(self, start, end):
+        self.start = start
+        self.end = end
+
+class ShowDocumentParams:
+    """"""
+
+    uri : str
+    """"""
+
+    external : bool
+    """"""
+
+    takeFocus : bool
+    """"""
+
+    selection : Range
+    """"""
+
+    def __init__(self, uri, external, takeFocus, selection):
+        self.uri = uri
+        self.external = external
+        self.takeFocus = takeFocus
+        self.selection = selection
+
+class ShowDocumentResult:
+    """"""
+
+    success : bool
+    """"""
+
+    def __init__(self, success):
+        self.success = success
+
+class TaskFinishedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TaskStartedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"ProofMacroDesc": ProofMacroDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"NodeId": NodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"List": List,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index 2855e390f75..1c6c904553e 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -22,6 +22,8 @@
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * @author Alexander Weigl
@@ -43,21 +45,16 @@ public static void main(String[] args) {
             addClientEndpoint(method);
         }
 
-        try {
-            Files.writeString(Paths.get("api.meta.json"), getGson().toJson(keyApi));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        runGenerator("api.meta.json", (a) -> () -> getGson().toJson(a));
+        runGenerator("api.meta.md", DocGen::new);
+        runGenerator("keydata.py", PythionGenerator.PyDataGen::new);
+        runGenerator("server.py", PythionGenerator.PyApiGen::new);
+    }
 
+    private static void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
         try {
-            var n = new DocGen(keyApi);
-            Files.writeString(Paths.get("api.meta.md"), n.get());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        try {
-            var n = new PyGen(keyApi);
-            Files.writeString(Paths.get("api.py"), n.get());
+            var n = api.apply(keyApi);
+            Files.writeString(Paths.get(target), n.get());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -124,7 +121,7 @@ private static List<Metamodel.Argument> translate(Parameter[] parameters) {
     }
 
     private static Metamodel.Argument translate(Parameter parameter) {
-        var type =  getOrFindType(parameter.getType()).name();
+        var type = getOrFindType(parameter.getType()).name();
         return new Metamodel.Argument(parameter.getName(), type);
     }
 
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index 833699cfe0c..1a868f49a06 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -41,10 +41,13 @@ record ClientRequest(String name, String documentation, List<Argument> args, Typ
     record ClientNotification(String name, String documentation, List<Argument> args) implements Endpoint {
     }
 
-    record Field(String name, /*Type*/ String type) {
+    record Field(String name, /*Type*/ String type, String documentation) {
+        Field(String name, String type) {
+            this(name, type, "");
+        }
     }
 
-    sealed interface Type {
+    public sealed interface Type {
         default String kind() {
             return getClass().getSimpleName();
         }
diff --git a/keyext.api.doc/src/main/java/PyGen.java b/keyext.api.doc/src/main/java/PyGen.java
deleted file mode 100644
index 357c2f51e8d..00000000000
--- a/keyext.api.doc/src/main/java/PyGen.java
+++ /dev/null
@@ -1,136 +0,0 @@
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public class PyGen implements Supplier<String> {
-    private final Metamodel.KeyApi metamodel;
-    private PrintWriter out;
-    private final StringWriter target = new StringWriter();
-
-    public PyGen(Metamodel.KeyApi metamodel) {
-        this.metamodel = metamodel;
-    }
-
-    @Override
-    public String get() {
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-
-            out.format("""
-                    import enum
-                    import abc
-                    import typing
-                    from abc import abstractmethod                    
-                    """);
-
-            metamodel.types().forEach(this::printType);
-            server(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
-
-            client(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
-
-        }
-        return target.toString();
-    }
-
-    private void client(Stream<Metamodel.Endpoint> sorted) {
-        out.format("class Client(abc.AbcMeta):%n");
-        sorted.forEach(this::clientEndpoint);
-    }
-
-    private void clientEndpoint(Metamodel.Endpoint endpoint) {
-        var args = endpoint.args().stream()
-                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
-                .collect(Collectors.joining(", "));
-        out.format("    @abstractmethod%n");
-        if (endpoint instanceof Metamodel.ClientRequest sr) {
-            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args, asPython(sr.returnType()));
-        } else {
-            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
-        }
-        out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-        out.format("        pass".formatted(endpoint.name(), ""));
-        out.println();
-        out.println();
-    }
-
-    private void server(Stream<Metamodel.Endpoint> sorted) {
-        out.format("class KeyServer():%n");
-        sorted.forEach(this::serverEndpoint);
-    }
-
-    private void serverEndpoint(Metamodel.Endpoint endpoint) {
-        var args = endpoint.args().stream()
-                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
-                .collect(Collectors.joining(", "));
-        if (endpoint instanceof Metamodel.ServerRequest sr) {
-            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                    asPython(sr.returnType()));
-            out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
-            out.format("       return self.rpc.call_sync(\"%s\", %s)".formatted(endpoint.name(), ""));
-        } else {
-            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
-            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-            out.format("        return self.rpc.call_async(\"%s\", %s)".formatted(endpoint.name(), ""));
-        }
-        out.println();
-        out.println();
-    }
-
-    private void printType(Metamodel.Type type) {
-        if (type instanceof Metamodel.ObjectType ot) {
-            out.format("class %s:%n".formatted(type.name()));
-            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
-            ot.fields().forEach(it -> out.format("    %s : %s%n".formatted(it.name(), asPython(it.type()))));
-        } else if (type instanceof Metamodel.EnumType et) {
-            out.format("class %s(enum.Enum):%n".formatted(type.name()));
-            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
-            et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
-        }
-        out.println();
-    }
-
-    private String asPython(String typeName) {
-        return switch (typeName) {
-            case "INT" -> "int";
-            case "LONG" -> "int";
-            case "STRING" -> "str";
-            case "BOOL" -> "bool";
-            case "DOUBLE" -> "float";
-            default -> {
-                var t = findType(typeName);
-                yield asPython(t);
-            }
-        };
-    }
-
-    private String asPython(Metamodel.Type t) {
-        if (t instanceof Metamodel.ListType lt) {
-            return "typing.List[" + asPython(lt.type()) + "]";
-        }
-
-        if (t instanceof Metamodel.EitherType lt) {
-            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
-        }
-        return t.name();
-    }
-
-    private Metamodel.Type findType(String typeName) {
-        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
-                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
-    }
-}
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/PythionGenerator.java b/keyext.api.doc/src/main/java/PythionGenerator.java
new file mode 100644
index 00000000000..a4d2018c328
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PythionGenerator.java
@@ -0,0 +1,223 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public abstract class PythionGenerator implements Supplier<String> {
+    protected final Metamodel.KeyApi metamodel;
+    protected PrintWriter out;
+    protected final StringWriter target = new StringWriter();
+
+    public PythionGenerator(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+            run();
+        }
+        return target.toString();
+    }
+
+    protected abstract void run();
+
+    protected String asPython(String typeName) {
+        return switch (typeName) {
+            case "INT" -> "int";
+            case "LONG" -> "int";
+            case "STRING" -> "str";
+            case "BOOL" -> "bool";
+            case "DOUBLE" -> "float";
+            default -> {
+                var t = findType(typeName);
+                yield asPython(t);
+            }
+        };
+    }
+
+    protected String asPython(Metamodel.Type t) {
+        if (t instanceof Metamodel.ListType lt) {
+            return "typing.List[" + asPython(lt.type()) + "]";
+        }
+
+        if (t instanceof Metamodel.EitherType lt) {
+            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+        }
+
+        if (t instanceof Metamodel.BuiltinType bt) {
+            return switch (bt) {
+                case INT -> "int";
+                case LONG -> "int";
+                case STRING -> "str";
+                case BOOL -> "bool";
+                case DOUBLE -> "float";
+            };
+        }
+        return t.name();
+    }
+
+    protected Metamodel.Type findType(String typeName) {
+        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
+                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
+    }
+
+
+    public static class PyApiGen extends PythionGenerator {
+        public PyApiGen(Metamodel.KeyApi metamodel) {
+            super(metamodel);
+        }
+
+        @Override
+        protected void run() {
+            out.format("""
+                    from __future__ import annotations
+                    from .keydata import *
+                    from .rpc import ServerBase, LspEndpoint
+
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod                    
+                    """);
+            server(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+            client(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+        }
+
+
+        private void client(Stream<Metamodel.Endpoint> sorted) {
+            out.format("class Client(abc.ABCMeta):%n");
+            sorted.forEach(this::clientEndpoint);
+        }
+
+        private void clientEndpoint(Metamodel.Endpoint endpoint) {
+            var args = endpoint.args().stream()
+                    .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                    .collect(Collectors.joining(", "));
+            out.format("    @abstractmethod%n");
+            if (endpoint instanceof Metamodel.ClientRequest sr) {
+                out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                        asPython(sr.returnType()));
+            } else {
+                out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+            }
+            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+            out.format("        pass".formatted(endpoint.name(), ""));
+            out.println();
+            out.println();
+        }
+
+        private void server(Stream<Metamodel.Endpoint> sorted) {
+            out.format("""
+                    class KeyServer(ServerBase):%n
+                        def __init__(self, endpoint : LspEndpoint):
+                            super().__init__(endpoint)
+                              
+                     """);
+            sorted.forEach(this::serverEndpoint);
+        }
+
+        private void serverEndpoint(Metamodel.Endpoint endpoint) {
+            var args = endpoint.args().stream()
+                    .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                    .collect(Collectors.joining(", "));
+
+            var params = "[]";
+            if (!endpoint.args().isEmpty()) {
+                params = endpoint.args().stream()
+                        .map(Metamodel.Argument::name)
+                        .collect(Collectors.joining(" , ", "[", "]"));
+            }
+
+            if (endpoint instanceof Metamodel.ServerRequest sr) {
+                out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                        asPython(sr.returnType()));
+                out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
+                out.format("       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
+            } else {
+                out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+                out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(), params));
+            }
+            out.println();
+            out.println();
+        }
+
+    }
+
+
+    public static class PyDataGen extends PythionGenerator {
+        public PyDataGen(Metamodel.KeyApi metamodel) {
+            super(metamodel);
+        }
+
+        @Override
+        public String get() {
+            try (var out = new PrintWriter(target)) {
+                this.out = out;
+                run();
+            }
+            return target.toString();
+        }
+
+        protected void run() {
+            out.format("""
+                    from __future__ import annotations
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod, ABCMeta
+                                                          
+                    """);
+            metamodel.types().forEach(this::printType);
+
+            var names = metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
+                    .collect(Collectors.joining(","));
+            out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
+        }
+
+        private void printType(Metamodel.Type type) {
+            if (type instanceof Metamodel.ObjectType ot) {
+                out.format("class %s:%n".formatted(type.name()));
+                out.format("    \"\"\"%s\"\"\"%n", type.documentation());
+                ot.fields().forEach(it -> out.format("%n    %s : %s%n    \"\"\"%s\"\"\"%n"
+                        .formatted(it.name(), asPython(it.type()), it.documentation())));
+
+                out.format("\n    def __init__(self%s):%n".formatted(
+                        ot.fields().stream()
+                                .map(Metamodel.Field::name)
+                                .collect(Collectors.joining(", ", ", ", ""))
+                ));
+
+                if (ot.fields().isEmpty())
+                    out.format("        pass%n%n");
+
+                for (Metamodel.Field field : ot.fields()) {
+                    out.format("        self.%s = %s%n", field.name(), field.name());
+                }
+
+            } else if (type instanceof Metamodel.EnumType et) {
+                out.format("class %s(enum.Enum):%n".formatted(type.name()));
+                out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+                et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
+            }
+            out.println();
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index fbbbac93898..71e79884c3d 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -27,5 +27,6 @@ dependencies {
 
 compileJava {
     // for GraalVM options.compilerArgs += ["-Aproject=${project.group}/${project.name}"]
+    options.compilerArgs += ["-parameters"] // for having parameter name in reflection
 }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
new file mode 100644
index 00000000000..b8f61b62272
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -0,0 +1,56 @@
+package org.keyproject.key.api;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+
+/**
+ * <a href="https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow post</a>
+ */
+public class GenericSerializer implements JsonSerializer<Object> /*, JsonDeserializer<Object>*/ {
+
+    private static final String CLASS_PROPERTY_NAME = "$type";
+    private final Gson gson;
+
+    public GenericSerializer() {
+        gson = new Gson();
+    }
+
+    public GenericSerializer(Gson gson) {
+        this.gson = gson;
+    }
+
+    /*
+    @Override
+    public Object deserialize(JsonElement json, Type typeOfT,
+                              JsonDeserializationContext context) throws JsonParseException {
+
+        Class<?> actualClass;
+        if (json.isJsonObject()) {
+            JsonObject jsonObject = json.getAsJsonObject();
+            String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
+            try {
+                actualClass = Class.forName(className);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+                throw new JsonParseException(e.getMessage());
+            }
+        } else {
+            actualClass = typeOfT.getClass();
+        }
+
+        return gson.fromJson(json, actualClass);
+    }
+     */
+
+    @Override
+    public JsonElement serialize(Object src, Type typeOfSrc,
+                                 JsonSerializationContext context) {
+        JsonElement retValue = gson.toJsonTree(src);
+        if (retValue.isJsonObject()) {
+            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getName());
+        }
+        return retValue;
+    }
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 7ff86ae2c09..f2a28731d3a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -75,7 +75,8 @@ public KeyApiImpl() {
     @JsonRequest
     public CompletableFuture<List<ExampleDesc>> examples() {
         return CompletableFutures.computeAsync((c) ->
-                ExampleChooser.listExamples(ExampleChooser.lookForExamples()).stream().map(it -> ExampleDesc.from(it)).toList());
+                ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+                        .stream().map(ExampleDesc::from).toList());
     }
 
     @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index b95ae6eebe2..26981875aef 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -26,8 +26,6 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
-    private static KeyAdapter adapter;
-
     //region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
@@ -146,7 +144,9 @@ public void run() {
 
 
     public static void configureJson(GsonBuilder gsonBuilder) {
-        adapter = new KeyAdapter(gsonBuilder);
+        gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
+        gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
+
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
@@ -167,3 +167,4 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
         return launcherBuilder.create();
     }
 }
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 68b330491fc..c17647c9e4f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -48,7 +48,7 @@ public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationCo
         }
     }
 
-    static class FileTypeAdapter extends TypeAdapter<File> {
+    public static class FileTypeAdapter extends TypeAdapter<File> {
         @Override
         public void write(JsonWriter out, File value) throws IOException {
             out.value(value.toString());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 5e5f4f1410b..49e662c6524 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api.remoteclient;
 
+import java.util.List;
+
 public record ShowMessageRequestParams(
         /**
          * The message type. See {@link MessageType}
@@ -15,6 +17,6 @@ public record ShowMessageRequestParams(
          * The message action items to present.
          *
          */
-        MessageActionItem[] actions
+        List<MessageActionItem> actions
 ) {
 }
\ No newline at end of file
diff --git a/keyext.client.python/keyapi/__init__.py b/keyext.client.python/keyapi/__init__.py
index 4a913b39b2e..4807ec5ee59 100644
--- a/keyext.client.python/keyapi/__init__.py
+++ b/keyext.client.python/keyapi/__init__.py
@@ -1,8 +1,8 @@
-from keyapi.rpc import *
+import abc
+from abc import abstractmethod, ABCMeta
+
+from keyapi.keydata import *
+from keyapi.rpc import LspEndpoint
+
 
-class KeyStub(JsonRPCHandler):
-    def __init__(self, input, output):
-        super().__init__(input, output)
 
-    def list_examples(self):
-        return self._send("examples/list", [])
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
new file mode 100644
index 00000000000..dfeaf76f7c7
--- /dev/null
+++ b/keyext.client.python/keyapi/keydata.py
@@ -0,0 +1,533 @@
+from __future__ import annotations
+import enum
+import abc
+import typing
+from abc import abstractmethod, ABCMeta
+
+
+class ExampleDesc:
+    """"""
+
+    name: str
+    """"""
+
+    description: str
+    """"""
+
+    def __init__(self, name, description):
+        self.name = name
+        self.description = description
+
+
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class ProofMacroDesc:
+    """"""
+
+    name: str
+    """"""
+
+    category: str
+    """"""
+
+    description: str
+    """"""
+
+    scriptCommandName: str
+    """"""
+
+    def __init__(self, name, category, description, scriptCommandName):
+        self.name = name
+        self.category = category
+        self.description = description
+        self.scriptCommandName = scriptCommandName
+
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+
+class SetTraceParams:
+    """"""
+
+    value: TraceValue
+    """"""
+
+    def __init__(self, value):
+        self.value = value
+
+
+class EnvironmentId:
+    """"""
+
+    envId: str
+    """"""
+
+    def __init__(self, envId):
+        self.envId = envId
+
+
+class ProofId:
+    """"""
+
+    env: EnvironmentId
+    """"""
+
+    proofId: str
+    """"""
+
+    def __init__(self, env, proofId):
+        self.env = env
+        self.proofId = proofId
+
+
+class TreeNodeDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TreeNodeId:
+    """"""
+
+    id: str
+    """"""
+
+    def __init__(self, id):
+        self.id = id
+
+
+class NodeId:
+    """"""
+
+    proofId: ProofId
+    """"""
+
+    nodeId: int
+    """"""
+
+    def __init__(self, proofId, nodeId):
+        self.proofId = proofId
+        self.nodeId = nodeId
+
+
+class PrintOptions:
+    """"""
+
+    unicode: bool
+    """"""
+
+    width: int
+    """"""
+
+    indentation: int
+    """"""
+
+    pure: bool
+    """"""
+
+    termLabels: bool
+    """"""
+
+    def __init__(self, unicode, width, indentation, pure, termLabels):
+        self.unicode = unicode
+        self.width = width
+        self.indentation = indentation
+        self.pure = pure
+        self.termLabels = termLabels
+
+
+class NodeTextId:
+    """"""
+
+    nodeId: NodeId
+    """"""
+
+    nodeTextId: int
+    """"""
+
+    def __init__(self, nodeId, nodeTextId):
+        self.nodeId = nodeId
+        self.nodeTextId = nodeTextId
+
+
+class NodeTextDesc:
+    """"""
+
+    id: NodeTextId
+    """"""
+
+    result: str
+    """"""
+
+    def __init__(self, id, result):
+        self.id = id
+        self.result = result
+
+
+class TermActionId:
+    """"""
+
+    nodeId: NodeId
+    """"""
+
+    pio: str
+    """"""
+
+    id: str
+    """"""
+
+    def __init__(self, nodeId, pio, id):
+        self.nodeId = nodeId
+        self.pio = pio
+        self.id = id
+
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+
+class TermActionDesc:
+    """"""
+
+    commandId: TermActionId
+    """"""
+
+    displayName: str
+    """"""
+
+    description: str
+    """"""
+
+    category: str
+    """"""
+
+    kind: TermActionKind
+    """"""
+
+    def __init__(self, commandId, displayName, description, category, kind):
+        self.commandId = commandId
+        self.displayName = displayName
+        self.description = description
+        self.category = category
+        self.kind = kind
+
+
+class List:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class SortDesc:
+    """"""
+
+    string: str
+    """"""
+
+    documentation: str
+    """"""
+
+    extendsSorts: List
+    """"""
+
+    anAbstract: bool
+    """"""
+
+    s: str
+    """"""
+
+    def __init__(self, string, documentation, extendsSorts, anAbstract, s):
+        self.string = string
+        self.documentation = documentation
+        self.extendsSorts = extendsSorts
+        self.anAbstract = anAbstract
+        self.s = s
+
+
+class FunctionDesc:
+    """"""
+
+    name: str
+    """"""
+
+    sort: str
+    """"""
+
+    retSort: SortDesc
+    """"""
+
+    argSorts: List
+    """"""
+
+    rigid: bool
+    """"""
+
+    unique: bool
+    """"""
+
+    skolemConstant: bool
+    """"""
+
+    def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant):
+        self.name = name
+        self.sort = sort
+        self.retSort = retSort
+        self.argSorts = argSorts
+        self.rigid = rigid
+        self.unique = unique
+        self.skolemConstant = skolemConstant
+
+
+class ContractId:
+    """"""
+
+    envId: EnvironmentId
+    """"""
+
+    contractId: int
+    """"""
+
+    def __init__(self, envId, contractId):
+        self.envId = envId
+        self.contractId = contractId
+
+
+class ContractDesc:
+    """"""
+
+    contractId: ContractId
+    """"""
+
+    name: str
+    """"""
+
+    displayName: str
+    """"""
+
+    typeName: str
+    """"""
+
+    htmlText: str
+    """"""
+
+    plainText: str
+    """"""
+
+    def __init__(self, contractId, name, displayName, typeName, htmlText, plainText):
+        self.contractId = contractId
+        self.name = name
+        self.displayName = displayName
+        self.typeName = typeName
+        self.htmlText = htmlText
+        self.plainText = plainText
+
+
+class LoadParams:
+    """"""
+
+    keyFile: str
+    """"""
+
+    javaFile: str
+    """"""
+
+    classPath: List
+    """"""
+
+    bootClassPath: str
+    """"""
+
+    includes: List
+    """"""
+
+    def __init__(self, keyFile, javaFile, classPath, bootClassPath, includes):
+        self.keyFile = keyFile
+        self.javaFile = javaFile
+        self.classPath = classPath
+        self.bootClassPath = bootClassPath
+        self.includes = includes
+
+
+
+class ProblemDefinition:
+    """"""
+
+    sorts: List
+    """"""
+
+    functions: List
+    """"""
+
+    predicates: List
+    """"""
+
+    antecTerms: List
+    """"""
+
+    succTerms: List
+    """"""
+
+    def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
+        self.sorts = sorts
+        self.functions = functions
+        self.predicates = predicates
+        self.antecTerms = antecTerms
+        self.succTerms = succTerms
+
+
+class LogTraceParams:
+    """"""
+
+    messag: str
+    """"""
+
+    verbose: str
+    """"""
+
+    def __init__(self, messag, verbose):
+        self.messag = messag
+        self.verbose = verbose
+
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+
+class ShowMessageParams:
+    """"""
+
+    type: MessageType
+    """"""
+
+    message: str
+    """"""
+
+    def __init__(self, type, message):
+        self.type = type
+        self.message = message
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type: MessageType
+    """"""
+
+    message: str
+    """"""
+
+    actions: List
+    """"""
+
+    def __init__(self, type, message, actions):
+        self.type = type
+        self.message = message
+        self.actions = actions
+
+
+class MessageActionItem:
+    """"""
+
+    title: str
+    """"""
+
+    def __init__(self, title):
+        self.title = title
+
+
+class Range:
+    """"""
+
+    start: int
+    """"""
+
+    end: int
+    """"""
+
+    def __init__(self, start, end):
+        self.start = start
+        self.end = end
+
+
+class ShowDocumentParams:
+    """"""
+
+    uri: str
+    """"""
+
+    external: bool
+    """"""
+
+    takeFocus: bool
+    """"""
+
+    selection: Range
+    """"""
+
+    def __init__(self, uri, external, takeFocus, selection):
+        self.uri = uri
+        self.external = external
+        self.takeFocus = takeFocus
+        self.selection = selection
+
+
+class ShowDocumentResult:
+    """"""
+
+    success: bool
+    """"""
+
+    def __init__(self, success):
+        self.success = success
+
+
+class TaskFinishedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TaskStartedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+KEY_DATA_CLASSES = {"ExampleDesc": ExampleDesc, "ProofScriptCommandDesc": ProofScriptCommandDesc,
+                    "ProofMacroDesc": ProofMacroDesc, "TraceValue": TraceValue, "SetTraceParams": SetTraceParams,
+                    "EnvironmentId": EnvironmentId, "ProofId": ProofId, "TreeNodeDesc": TreeNodeDesc,
+                    "TreeNodeId": TreeNodeId, "NodeId": NodeId, "PrintOptions": PrintOptions, "NodeTextId": NodeTextId,
+                    "NodeTextDesc": NodeTextDesc, "TermActionId": TermActionId, "TermActionKind": TermActionKind,
+                    "TermActionDesc": TermActionDesc, "List": List, "SortDesc": SortDesc, "FunctionDesc": FunctionDesc,
+                    "ContractId": ContractId, "ContractDesc": ContractDesc, "LoadParams": LoadParams,
+                    "ProblemDefinition": ProblemDefinition, "LogTraceParams": LogTraceParams,
+                    "MessageType": MessageType, "ShowMessageParams": ShowMessageParams,
+                    "ShowMessageRequestParams": ShowMessageRequestParams, "MessageActionItem": MessageActionItem,
+                    "Range": Range, "ShowDocumentParams": ShowDocumentParams, "ShowDocumentResult": ShowDocumentResult,
+                    "TaskFinishedInfo": TaskFinishedInfo, "TaskStartedInfo": TaskStartedInfo}
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
index 02ba2be474b..c112055e006 100644
--- a/keyext.client.python/keyapi/rpc.py
+++ b/keyext.client.python/keyapi/rpc.py
@@ -1,10 +1,11 @@
 import enum
 import json
-import sys
 import threading
-from io import TextIOWrapper
+import typing
 from typing import Dict
 
+from keyapi import KEY_DATA_CLASSES
+
 JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
 LEN_HEADER = "Content-Length: "
 TYPE_HEADER = "Content-Type: "
@@ -16,16 +17,20 @@ class MyEncoder(json.JSONEncoder):
     """
 
     def default(self, o):  # pylint: disable=E0202
-        return o.__dict__
+        d = dict(o.__dict__)
+        d['$type'] = type(o).__name__
+        return d
 
 
 class ResponseError(Exception):
-    def __init__(self, error_code, message):
+    def __init__(self, error_code, message, data=None):
         super().__init__(message)
         self.error_code = error_code
+        self.data = data
 
 
 class ErrorCodes(enum.Enum):
+    MethodNotFound = None
     ParseError = 1
 
 
@@ -57,27 +62,27 @@ def send_request(self, message):
 
         :param dict message: The message to send.
         '''
-        json_string = json.dumps(message, cls=MyEncoder)
+        json_string = json.dumps(message , cls=MyEncoder)
         jsonrpc_req = self.__add_header(json_string)
         with self.write_lock:
-            self.stdin.write(jsonrpc_req.encode())
-            self.stdin.flush()
+            self.stdout.write(jsonrpc_req)
+            self.stdout.flush()
 
-    def recv_response(self):
+    def recv_response(self) -> object:
         '''
         Recives a message.
 
         :return: a message
         '''
-        with self.read_lock:
+        with (self.read_lock):
             message_size = None
             while True:
                 # read header
-                line = self.stdout.readline()
+                line = self.stdin.readline()
                 if not line:
                     # server quit
                     return None
-                line = line.decode("utf-8")
+                # line = line.decode("utf-8")
                 if not line.endswith("\r\n"):
                     raise ResponseError(ErrorCodes.ParseError, "Bad header: missing newline")
                 # remove the "\r\n"
@@ -99,12 +104,18 @@ def recv_response(self):
             if not message_size:
                 raise ResponseError(ErrorCodes.ParseError, "Bad header: missing size")
 
-            jsonrpc_res = self.stdout.read(message_size).decode("utf-8")
-            return json.loads(jsonrpc_res)
+            jsonrpc_res = self.stdin.read(message_size)  # .decode("utf-8")
+            return json.loads(jsonrpc_res, object_hook=object_decoder)
+
+
+def object_decoder(obj):
+    if '$type' in obj:
+        return KEY_DATA_CLASSES[obj["$type"]](**obj)
+    return obj
 
 
 class LspEndpoint(threading.Thread):
-    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2):
+    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2000):
         super().__init__()
         self.json_rpc_endpoint: JsonRpcEndpoint = json_rpc_endpoint
         self.notify_callbacks: Dict = notify_callbacks or {}
@@ -126,6 +137,7 @@ def stop(self):
         self.shutdown_flag = True
 
     def run(self):
+        rpc_id = None
         while not self.shutdown_flag:
             try:
                 jsonrpc_message = self.json_rpc_endpoint.recv_response()
@@ -175,14 +187,14 @@ def send_message(self, method_name, params, id=None):
         message_dict["params"] = params
         self.json_rpc_endpoint.send_request(message_dict)
 
-    def call_method(self, method_name, **kwargs):
+    def call_method(self, method_name, args):
         current_id = self.next_id
         self.next_id += 1
         cond = threading.Condition()
         self.event_dict[current_id] = cond
 
         cond.acquire()
-        self.send_message(method_name, kwargs, current_id)
+        self.send_message(method_name, args, current_id)
         if self.shutdown_flag:
             return None
 
@@ -196,5 +208,17 @@ def call_method(self, method_name, **kwargs):
             raise ResponseError(error.get("code"), error.get("message"), error.get("data"))
         return result
 
-    def send_notification(self, method_name, **kwargs):
+    def send_notification(self, method_name, kwargs):
         self.send_message(method_name, kwargs)
+
+
+class ServerBase:
+    def __init__(self, endpoint: LspEndpoint):
+        self.endpoint = endpoint
+
+    def _call_sync(self, method_name: str, param: typing.List[object]) -> object:
+        resp = self.endpoint.call_method(method_name, param)
+        return resp
+
+    def _call_async(self, method_name: str, param: typing.List[object]):
+        self.endpoint.send_notification(method_name, param)
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
new file mode 100644
index 00000000000..2940363e1c2
--- /dev/null
+++ b/keyext.client.python/keyapi/server.py
@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+import abc
+from abc import abstractmethod
+
+from .keydata import *
+from .rpc import ServerBase, LspEndpoint
+
+
+# noinspection PyTypeChecker
+class KeyServer(ServerBase):
+
+    def __init__(self, endpoint: LspEndpoint):
+        super().__init__(endpoint)
+
+    def env_contracts(self, env: EnvironmentId) -> typing.List[ContractDesc]:
+        """"""
+
+        return self._call_sync("env/contracts", [env])
+
+    def env_functions(self, env: EnvironmentId) -> typing.List[FunctionDesc]:
+        """"""
+
+        return self._call_sync("env/functions", [env])
+
+    def env_openContract(self, contractId: ContractId) -> ProofId:
+        """"""
+
+        return self._call_sync("env/openContract", [contractId])
+
+    def env_sorts(self, env: EnvironmentId) -> typing.List[SortDesc]:
+        """"""
+
+        return self._call_sync("env/sorts", [env])
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+        """"""
+
+        return self._call_sync("examples/list", [])
+
+    def goal_actions(self, id: NodeTextId, pos: int) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self._call_sync("goal/actions", [id, pos])
+
+    def goal_apply_action(self, id: TermActionId) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self._call_sync("goal/apply_action", [id])
+
+    def goal_free(self, id: NodeTextId):
+        """"""
+
+        return self._call_async("goal/free", [id])
+
+    def goal_print(self, id: NodeId, options: PrintOptions) -> NodeTextDesc:
+        """"""
+
+        return self._call_sync("goal/print", [id, options])
+
+    def loading_load(self, params: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+        """"""
+
+        return self._call_sync("loading/load", [params])
+
+    def loading_loadExample(self, id: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadExample", [id])
+
+    def loading_loadKey(self, content: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadKey", [content])
+
+    def loading_loadProblem(self, problem: ProblemDefinition) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadProblem", [problem])
+
+    def loading_loadTerm(self, term: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadTerm", [term])
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+        """"""
+
+        return self._call_sync("meta/available_macros", [])
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+        """"""
+
+        return self._call_sync("meta/available_script_commands", [])
+
+    def meta_version(self, ) -> str:
+        """"""
+
+        return self._call_sync("meta/version", [])
+
+    def proofTree_children(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self._call_sync("proofTree/children", [proof, nodeId])
+
+    def proofTree_root(self, id: ProofId) -> TreeNodeDesc:
+        """"""
+
+        return self._call_sync("proofTree/root", [id])
+
+    def proofTree_subtree(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self._call_sync("proofTree/subtree", [proof, nodeId])
+
+    def server_exit(self, ):
+        """"""
+
+        return self._call_async("server/exit", [])
+
+    def server_setTrace(self, params: SetTraceParams):
+        """"""
+
+        return self._call_async("server/setTrace", [params])
+
+    def server_shutdown(self, ) -> bool:
+        """"""
+
+        return self._call_sync("server/shutdown", [])
+
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, params: LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, e: str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, params: ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, params: ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, params: ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index a5cb45321d8..d12fadea42a 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -1,5 +1,7 @@
 import socket
-from keyapi import KeyStub, KeyClient
+from keyapi import LspEndpoint, LoadParams
+from keyapi.server import KeyServer
+from keyapi.rpc import JsonRpcEndpoint
 
 if __name__ == "__main__":
     target = ("localhost", 5151)
@@ -8,6 +10,18 @@
         s.connect(target)
         input = s.makefile("r", newline="\r\n")
         output = s.makefile("w", newline="\r\n")
-        stub = KeyStub(input, output)
-        stub.client = KeyClient()
-        print(stub.list_examples())
+
+        rpc_endpoint = JsonRpcEndpoint(input, output)
+        endpoint = LspEndpoint(rpc_endpoint)
+        endpoint.start()
+
+        key = KeyServer(endpoint)
+        print(key.meta_version())
+        ex = key.examples_list()
+        print(ex)
+
+        proofHandle = key.loading_load(
+            LoadParams("/home/weigl/work/key/key.ui/examples/standard_key/prop_log/contraposition.key",
+                       None, None, None, None))
+
+        print(proofHandle)
diff --git a/keyext.client.python/rwtest.py b/keyext.client.python/rwtest.py
deleted file mode 100644
index 312532192dc..00000000000
--- a/keyext.client.python/rwtest.py
+++ /dev/null
@@ -1,402 +0,0 @@
-import enum
-import abc
-import typing
-from abc import abstractmethod
-
-
-class ExampleDesc:
-    """"""
-
-    name: str
-    description: str
-
-
-class ProofScriptCommandDesc:
-    """"""
-
-
-class ProofMacroDesc:
-    """"""
-
-    name: str
-    category: str
-    description: str
-    scriptCommandName: str
-
-
-class TraceValue(enum.Enum):
-    """"""
-
-    Off = None
-    Message = None
-    All = None
-
-
-class SetTraceParams:
-    """"""
-
-    value: TraceValue
-
-
-class EnvironmentId:
-    """"""
-
-    envId: str
-
-
-class ProofId:
-    """"""
-
-    env: EnvironmentId
-    proofId: str
-
-
-class TreeNodeDesc:
-    """"""
-
-
-class TreeNodeId:
-    """"""
-
-    id: str
-
-
-class NodeId:
-    """"""
-
-    proofId: ProofId
-    nodeId: int
-
-
-class PrintOptions:
-    """"""
-
-    unicode: bool
-    width: int
-    indentation: int
-    pure: bool
-    termLabels: bool
-
-
-class NodeTextId:
-    """"""
-
-    nodeId: NodeId
-    nodeTextId: int
-
-
-class NodeTextDesc:
-    """"""
-
-    id: NodeTextId
-    result: str
-
-
-class TermActionId:
-    """"""
-
-    nodeId: NodeId
-    pio: str
-    id: str
-
-
-class TermActionKind(enum.Enum):
-    """"""
-
-    BuiltIn = None
-    Script = None
-    Macro = None
-    Taclet = None
-
-
-class TermActionDesc:
-    """"""
-
-    commandId: TermActionId
-    displayName: str
-    description: str
-    category: str
-    kind: TermActionKind
-
-
-class List:
-    """"""
-
-
-class SortDesc:
-    """"""
-
-    string: str
-    documentation: str
-    extendsSorts: List
-    anAbstract: bool
-    s: str
-
-
-class FunctionDesc:
-    """"""
-
-    name: str
-    sort: str
-    retSort: SortDesc
-    argSorts: List
-    rigid: bool
-    unique: bool
-    skolemConstant: bool
-
-
-class ContractId:
-    """"""
-
-    envId: EnvironmentId
-    contractId: int
-
-
-class ContractDesc:
-    """"""
-
-    contractId: ContractId
-    name: str
-    displayName: str
-    typeName: str
-    htmlText: str
-    plainText: str
-
-
-class LoadParams:
-    """"""
-
-    keyFile: str
-    javaFile: str
-    classPath: List
-    bootClassPath: str
-    includes: List
-
-
-class ProblemDefinition:
-    """"""
-
-    sorts: List
-    functions: List
-    predicates: List
-    antecTerms: List
-    succTerms: List
-
-
-class LogTraceParams:
-    """"""
-
-    messag: str
-    verbose: str
-
-
-class MessageType(enum.Enum):
-    """"""
-
-    Unused = None
-    Error = None
-    Warning = None
-    Info = None
-    Log = None
-    Debug = None
-
-
-class ShowMessageParams:
-    """"""
-
-    type: MessageType
-    message: str
-
-
-
-class ShowMessageRequestParams:
-    """"""
-
-    type: MessageType
-    message: str
-    actions: typing.List[MessageActionItem]
-
-
-class MessageActionItem:
-    """"""
-
-    title: str
-
-
-class Range:
-    """"""
-
-    start: int
-    end: int
-
-
-class ShowDocumentParams:
-    """"""
-
-    uri: str
-    external: bool
-    takeFocus: bool
-    selection: Range
-
-
-class ShowDocumentResult:
-    """"""
-
-    success: bool
-
-
-class TaskFinishedInfo:
-    """"""
-
-
-class TaskStartedInfo:
-    """"""
-
-
-class KeyServer():
-    def env_contracts(self, arg0: EnvironmentId) -> typing.List[ContractDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/contracts", )
-
-    def env_functions(self, arg0: EnvironmentId) -> typing.List[FunctionDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/functions", )
-
-    def env_openContract(self, arg0: ContractId) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("env/openContract", )
-
-    def env_sorts(self, arg0: EnvironmentId) -> typing.List[SortDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/sorts", )
-
-    def examples_list(self, ) -> typing.List[ExampleDesc]:
-        """"""
-
-        return self.rpc.call_sync("examples/list", )
-
-    def goal_actions(self, arg0: NodeTextId, arg1: int) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self.rpc.call_sync("goal/actions", )
-
-    def goal_apply_action(self, arg0: TermActionId) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self.rpc.call_sync("goal/apply_action", )
-
-    def goal_free(self, arg0: NodeTextId):
-        """"""
-
-        return self.rpc.call_async("goal/free", )
-
-    def goal_print(self, arg0: NodeId, arg1: PrintOptions) -> NodeTextDesc:
-        """"""
-
-        return self.rpc.call_sync("goal/print", )
-
-    def loading_load(self, arg0: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
-        """"""
-
-        return self.rpc.call_sync("loading/load", )
-
-    def loading_loadExample(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadExample", )
-
-    def loading_loadKey(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadKey", )
-
-    def loading_loadProblem(self, arg0: ProblemDefinition) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadProblem", )
-
-    def loading_loadTerm(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadTerm", )
-
-    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
-        """"""
-
-        return self.rpc.call_sync("meta/available_macros", )
-
-    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
-        """"""
-
-        return self.rpc.call_sync("meta/available_script_commands", )
-
-    def meta_version(self, ) -> str:
-        """"""
-
-        return self.rpc.call_sync("meta/version", )
-
-    def proofTree_children(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self.rpc.call_sync("proofTree/children", )
-
-    def proofTree_root(self, arg0: ProofId) -> TreeNodeDesc:
-        """"""
-
-        return self.rpc.call_sync("proofTree/root", )
-
-    def proofTree_subtree(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self.rpc.call_sync("proofTree/subtree", )
-
-    def server_exit(self, ):
-        """"""
-
-        return self.rpc.call_async("server/exit", )
-
-    def server_setTrace(self, arg0: SetTraceParams):
-        """"""
-
-        return self.rpc.call_async("server/setTrace", )
-
-    def server_shutdown(self, ) -> bool:
-        """"""
-
-        return self.rpc.call_sync("server/shutdown", )
-
-
-class Client(abc.ABCMeta):
-    @abstractmethod
-    def client_logTrace(self, arg0: LogTraceParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sayHello(self, arg0: str):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_showDocument(self, arg0: ShowDocumentParams) -> ShowDocumentResult:
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sm(self, arg0: ShowMessageParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_userResponse(self, arg0: ShowMessageRequestParams) -> MessageActionItem:
-        """"""
-
-        pass
diff --git a/server.py b/server.py
new file mode 100644
index 00000000000..7ad103297fe
--- /dev/null
+++ b/server.py
@@ -0,0 +1,159 @@
+from __future__ import annotations
+from .keydata import *
+from .rpc import ServerBase
+
+import enum
+import abc
+import typing
+from abc import abstractmethod
+class KeyServer(ServerBase):
+
+    def __init__(self, endpoint : LspEndpoint):
+        super().__init__(endpoint)
+
+    def env_contracts(self, env : EnvironmentId) -> typing.List[ContractDesc]:
+       """"""
+
+       return self._call_sync("env/contracts", [env])
+
+    def env_functions(self, env : EnvironmentId) -> typing.List[FunctionDesc]:
+       """"""
+
+       return self._call_sync("env/functions", [env])
+
+    def env_openContract(self, contractId : ContractId) -> ProofId:
+       """"""
+
+       return self._call_sync("env/openContract", [contractId])
+
+    def env_sorts(self, env : EnvironmentId) -> typing.List[SortDesc]:
+       """"""
+
+       return self._call_sync("env/sorts", [env])
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+       """"""
+
+       return self._call_sync("examples/list", [])
+
+    def goal_actions(self, id : NodeTextId, pos : int) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/actions", [id , pos])
+
+    def goal_apply_action(self, id : TermActionId) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/apply_action", [id])
+
+    def goal_free(self, id : NodeTextId):
+        """"""
+
+        return self._call_async("goal/free", [id])
+
+    def goal_print(self, id : NodeId, options : PrintOptions) -> NodeTextDesc:
+       """"""
+
+       return self._call_sync("goal/print", [id , options])
+
+    def loading_load(self, params : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+       """"""
+
+       return self._call_sync("loading/load", [params])
+
+    def loading_loadExample(self, id : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadExample", [id])
+
+    def loading_loadKey(self, content : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadKey", [content])
+
+    def loading_loadProblem(self, problem : ProblemDefinition) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadProblem", [problem])
+
+    def loading_loadTerm(self, term : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadTerm", [term])
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+       """"""
+
+       return self._call_sync("meta/available_macros", [])
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+       """"""
+
+       return self._call_sync("meta/available_script_commands", [])
+
+    def meta_version(self, ) -> str:
+       """"""
+
+       return self._call_sync("meta/version", [])
+
+    def proofTree_children(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/children", [proof , nodeId])
+
+    def proofTree_root(self, id : ProofId) -> TreeNodeDesc:
+       """"""
+
+       return self._call_sync("proofTree/root", [id])
+
+    def proofTree_subtree(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/subtree", [proof , nodeId])
+
+    def server_exit(self, ):
+        """"""
+
+        return self._call_async("server/exit", [])
+
+    def server_setTrace(self, params : SetTraceParams):
+        """"""
+
+        return self._call_async("server/setTrace", [params])
+
+    def server_shutdown(self, ) -> bool:
+       """"""
+
+       return self._call_sync("server/shutdown", [])
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, params : LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, e : str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, params : ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, params : ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, params : ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
+

From d2dcd70e0e7f44919ddbf81c3be46a5c11dfda97 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 3 Nov 2023 17:58:48 +0100
Subject: [PATCH 08/50] add throwable adapter

---
 .../main/java/org/keyproject/key/api/StartServer.java |  2 +-
 .../org/keyproject/key/api/adapters/KeyAdapter.java   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 26981875aef..b0491145cda 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -146,7 +146,7 @@ public void run() {
     public static void configureJson(GsonBuilder gsonBuilder) {
         gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
-
+        gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index c17647c9e4f..67871cec674 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -74,6 +74,17 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
         }
     }
 
+    public static class ThrowableAdapter implements JsonSerializer<Throwable> {
+        @Override
+        public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationContext context) {
+            var obj = new JsonObject();
+            obj.add("$class", context.serialize(src.getClass().getSimpleName()));
+            obj.add("message", context.serialize(src.getMessage()));
+            obj.add("cause", context.serialize(src.getCause()));
+            return obj;
+        }
+    }
+
     /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
         @Override
         public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {

From 6887838b8bf7118dff539a0a62069435903abe0f Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 18 Nov 2023 19:43:59 +0100
Subject: [PATCH 09/50] spotless and merge errors

---
 .../src/main/java/org/key_project/Main.java   |    3 +-
 .../AbstractSymbolicExecutionTestCase.java    | 1546 +++++++++--------
 .../key/control/AbstractProofControl.java     |    3 +-
 .../ilkd/key/control/DefaultProofControl.java |   27 +-
 .../uka/ilkd/key/control/KeYEnvironment.java  |  125 +-
 .../de/uka/ilkd/key/control/ProofControl.java |    5 +-
 .../uka/ilkd/key/macros/ProofMacroFacade.java |    3 +-
 .../key/macros/ProofMacroFinishedInfo.java    |    1 -
 .../scripts/ProofScriptCommandFacade.java     |    4 +-
 .../main/java/de/uka/ilkd/key/proof/Goal.java |    2 +-
 .../main/java/de/uka/ilkd/key/proof/Node.java |   33 +-
 .../speclang/njml/ContractLoadingTests.java   |   27 +-
 .../java/de/uka/ilkd/key/gui/Example.java     |   24 +-
 .../de/uka/ilkd/key/gui/ProofMacroWorker.java |   25 +-
 .../key/gui/actions/RunAllProofsAction.java   |   18 +-
 keyext.api.doc/src/main/java/DocGen.java      |  165 +-
 .../src/main/java/ExtractMetaData.java        |   99 +-
 keyext.api.doc/src/main/java/Metamodel.java   |   86 +-
 .../src/main/java/PythionGenerator.java       |   61 +-
 .../keyproject/key/api/GenericSerializer.java |   55 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  153 +-
 .../org/keyproject/key/api/NodeTextId.java    |    6 +-
 .../org/keyproject/key/api/StartServer.java   |   34 +-
 .../keyproject/key/api/TermActionUtil.java    |   91 +-
 .../key/api/adapters/KeyAdapter.java          |   89 +-
 .../key/api/adapters/package-info.java        |    2 +-
 .../keyproject/key/api/data/ContractDesc.java |    3 +
 .../keyproject/key/api/data/FunctionDesc.java |    7 +-
 .../key/api/data/KeyIdentifications.java      |   33 +-
 .../keyproject/key/api/data/LoadParams.java   |    3 +
 .../key/api/data/MacroDescription.java        |    3 +
 .../key/api/data/MacroStatistic.java          |    8 +-
 .../org/keyproject/key/api/data/NodeDesc.java |    7 +-
 .../keyproject/key/api/data/NodeTextDesc.java |    3 +
 .../key/api/data/PredicateDesc.java           |    3 +
 .../key/api/data/ProblemDefinition.java       |    7 +-
 .../key/api/data/ProofMacroDesc.java          |    3 +
 .../key/api/data/ProofScriptCommandDesc.java  |    3 +
 .../org/keyproject/key/api/data/SortDesc.java |    7 +-
 .../key/api/data/StreategyOptions.java        |    3 +
 .../key/api/data/TermActionDesc.java          |    3 +
 .../key/api/data/TermActionKind.java          |    3 +
 .../keyproject/key/api/data/TraceValue.java   |    3 +
 .../keyproject/key/api/data/TreeNodeDesc.java |    3 +
 .../keyproject/key/api/internal/NodeText.java |    5 +-
 .../keyproject/key/api/remoteapi/EnvApi.java  |    9 +-
 .../key/api/remoteapi/ExampleApi.java         |   10 +-
 .../key/api/remoteapi/ExampleDesc.java        |    3 +
 .../keyproject/key/api/remoteapi/GoalApi.java |   11 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |    6 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |   11 +-
 .../key/api/remoteapi/PrintOptions.java       |    3 +
 .../key/api/remoteapi/ProofApi.java           |   16 +-
 .../key/api/remoteapi/ProofLoadApi.java       |   17 +-
 .../key/api/remoteapi/ProofTreeApi.java       |    9 +-
 .../key/api/remoteapi/ServerManagement.java   |   20 +-
 .../key/api/remoteclient/ClientApi.java       |   34 +-
 .../api/remoteclient/LogMessageParams.java    |    3 +
 .../key/api/remoteclient/LogTraceParams.java  |    3 +
 .../api/remoteclient/MessageActionItem.java   |    3 +
 .../key/api/remoteclient/MessageType.java     |   53 +-
 .../api/remoteclient/ShowDocumentParams.java  |    3 +
 .../api/remoteclient/ShowDocumentResult.java  |    3 +
 .../api/remoteclient/ShowMessageParams.java   |    5 +-
 .../ShowMessageRequestParams.java             |    3 +
 .../org/keyproject/key/api/SimpleClient.java  |   10 +-
 .../java/org/keyproject/key/api/TestRpc.java  |   19 +-
 .../ProofExplorationServiceTest.java          |   38 +-
 .../ilkd/key/gui/testgen/TGInfoDialog.java    |    9 +-
 69 files changed, 1681 insertions(+), 1417 deletions(-)

diff --git a/key.core.example/src/main/java/org/key_project/Main.java b/key.core.example/src/main/java/org/key_project/Main.java
index 4da18d230e9..37530b71aa4 100644
--- a/key.core.example/src/main/java/org/key_project/Main.java
+++ b/key.core.example/src/main/java/org/key_project/Main.java
@@ -131,7 +131,8 @@ private static List<Contract> getContracts(KeYEnvironment<?> env) {
      * @param env the {@link KeYEnvironment} in which to prove the contract
      * @param contract the {@link Contract} to be proven
      */
-    private static void proveContract(KeYEnvironment<?> env, Contract contract) throws InterruptedException {
+    private static void proveContract(KeYEnvironment<?> env, Contract contract)
+            throws InterruptedException {
         Proof proof = null;
         try {
             // Create proof
diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
index 907a15d5c9d..ba7074ce7f7 100644
--- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
+++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
@@ -44,6 +44,7 @@
 import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
 import de.uka.ilkd.key.util.HelperClassForTests;
 import de.uka.ilkd.key.util.KeYConstants;
+
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableArray;
 import org.key_project.util.collection.ImmutableList;
@@ -51,15 +52,11 @@
 import org.key_project.util.helper.FindResources;
 import org.key_project.util.java.CollectionUtil;
 import org.key_project.util.java.StringUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -69,7 +66,7 @@
  */
 public abstract class AbstractSymbolicExecutionTestCase {
     private static final Logger LOGGER =
-            LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
+        LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
 
     /**
      * <p>
@@ -86,7 +83,7 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * </p>
      */
     public static final boolean CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY =
-            Boolean.getBoolean("UPDATE_TEST_ORACLE");
+        Boolean.getBoolean("UPDATE_TEST_ORACLE");
 
 
     static {
@@ -102,13 +99,13 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * Number of executed SET nodes to execute all in one.
      */
     public static final int ALL_IN_ONE_RUN =
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
+        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
 
     /**
      * Number of executed SET nodes for only one SET node per auto mode run.
      */
     public static final int SINGLE_SET_NODE_RUN =
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
+        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
 
     /**
      * Default stop conditions of executed SET nodes.
@@ -135,9 +132,9 @@ public abstract class AbstractSymbolicExecutionTestCase {
     static {
         // Define fast mode
         if (FAST_MODE) {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN};
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN };
         } else {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN};
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN };
         }
         // Create temporary director for oracle files if required.
         File directory = null;
@@ -160,18 +157,18 @@ public abstract class AbstractSymbolicExecutionTestCase {
     /**
      * Creates a new oracle file.
      *
-     * @param node                    The node to save as oracle file.
+     * @param node The node to save as oracle file.
      * @param oraclePathInBaseDirFile The path in example directory.
-     * @param saveConstraints         Save constraints?
-     * @param saveVariables           Save variables?
-     * @param saveCallStack           Save call stack?
-     * @param saveReturnValues        Save method return values?
-     * @throws IOException         Occurred Exception
+     * @param saveConstraints Save constraints?
+     * @param saveVariables Save variables?
+     * @param saveCallStack Save call stack?
+     * @param saveReturnValues Save method return values?
+     * @throws IOException Occurred Exception
      * @throws ProofInputException Occurred Exception
      */
     protected static void createOracleFile(IExecutionNode<?> node, String oraclePathInBaseDirFile,
-                                           boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
-                                           boolean saveReturnValues) throws IOException, ProofInputException {
+            boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
+            boolean saveReturnValues) throws IOException, ProofInputException {
         if (tempNewOracleDirectory != null && tempNewOracleDirectory.isDirectory()) {
             // Create sub folder structure
             File oracleFile = new File(tempNewOracleDirectory, oraclePathInBaseDirFile);
@@ -179,7 +176,7 @@ protected static void createOracleFile(IExecutionNode<?> node, String oraclePath
             // Create oracle file
             ExecutionNodeWriter writer = new ExecutionNodeWriter();
             writer.write(node, ExecutionNodeWriter.DEFAULT_ENCODING, oracleFile, saveVariables,
-                    saveCallStack, saveReturnValues, saveConstraints);
+                saveCallStack, saveReturnValues, saveConstraints);
             // Print message to the user.
             printOracleDirectory();
         }
@@ -207,37 +204,37 @@ protected static void printOracleDirectory() {
     /**
      * Makes sure that the given nodes and their subtrees contains the same content.
      *
-     * @param expected            The expected {@link IExecutionNode}.
-     * @param current             The current {@link IExecutionNode}.
-     * @param compareVariables    Compare variables?
-     * @param compareCallStack    Compare call stack?
-     * @param compareChildOrder   Is the order of children relevant?
+     * @param expected The expected {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
+     * @param compareVariables Compare variables?
+     * @param compareCallStack Compare call stack?
+     * @param compareChildOrder Is the order of children relevant?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints  Compare constraints?
+     * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
-                                            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
+            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         if (compareChildOrder) {
             // Order of children must be the same.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(expected);
+                new ExecutionNodePreorderIterator(expected);
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(current);
+                new ExecutionNodePreorderIterator(current);
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                        compareCallStack, compareReturnValues, compareConstraints);
+                    compareCallStack, compareReturnValues, compareConstraints);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             // Order of children is not relevant.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(expected);
+                new ExecutionNodePreorderIterator(expected);
             Set<IExecutionNode<?>> currentVisitedNodes = new LinkedHashSet<>();
             while (expectedExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
@@ -246,11 +243,11 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
                     fail("Node " + currentNext + " visited twice.");
                 }
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                        compareCallStack, compareReturnValues, compareConstraints);
+                    compareCallStack, compareReturnValues, compareConstraints);
             }
             // Make sure that each current node was visited
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(current);
+                new ExecutionNodePreorderIterator(current);
             while (actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 if (!currentVisitedNodes.remove(currentNext)) {
@@ -264,13 +261,13 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
     /**
      * Searches the direct or indirect child in subtree of the node to search in.
      *
-     * @param toSearchIn    The node to search in.
+     * @param toSearchIn The node to search in.
      * @param childToSearch The node to search.
      * @return The found node.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearchIn,
-                                                           IExecutionNode<?> childToSearch) throws ProofInputException {
+            IExecutionNode<?> childToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(toSearchIn);
         assertNotNull(childToSearch);
@@ -291,20 +288,20 @@ protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearc
             }
         }
         assertNotNull(toSearchIn, "Direct or indirect Child " + childToSearch
-                + " is not contained in " + toSearchIn + ".");
+            + " is not contained in " + toSearchIn + ".");
         return toSearchIn;
     }
 
     /**
      * Searches the direct child. Nodes are equal if the name and the element type is equal.
      *
-     * @param parentToSearchIn    The parent to search in its children.
+     * @param parentToSearchIn The parent to search in its children.
      * @param directChildToSearch The child to search.
      * @return The found child.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> parentToSearchIn,
-                                                             IExecutionNode<?> directChildToSearch) throws ProofInputException {
+            IExecutionNode<?> directChildToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(parentToSearchIn);
         assertNotNull(directChildToSearch);
@@ -318,60 +315,60 @@ protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> paren
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
-                        ((IExecutionBranchCondition) directChildToSearch)
-                                .getAdditionalBranchLabel())
+                            ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
+                            ((IExecutionBranchCondition) directChildToSearch)
+                                    .getAdditionalBranchLabel())
                         && children[i].getElementType()
-                        .equals(directChildToSearch.getElementType())) {
+                                .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             } else {
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && children[i].getElementType()
-                        .equals(directChildToSearch.getElementType())) {
+                                .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             }
             i++;
         }
         assertNotNull(result,
-                "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
+            "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
         return result;
     }
 
     /**
      * Makes sure that the given nodes contains the same content. Children are not compared.
      *
-     * @param expected            The expected {@link IExecutionNode}.
-     * @param current             The current {@link IExecutionNode}.
-     * @param compareParent       Compare also the parent node?
-     * @param compareVariables    Compare variables?
-     * @param compareCallStack    Compare call stack?
+     * @param expected The expected {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
+     * @param compareParent Compare also the parent node?
+     * @param compareVariables Compare variables?
+     * @param compareCallStack Compare call stack?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints  Compare constraints?
+     * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertExecutionNode(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                              boolean compareParent, boolean compareVariables, boolean compareCallStack,
-                                              boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+            boolean compareParent, boolean compareVariables, boolean compareCallStack,
+            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         // Compare nodes
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
+            "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
         assertEquals(expected.isPathConditionChanged(), current.isPathConditionChanged());
         if (!StringUtil.equalIgnoreWhiteSpace(expected.getFormatedPathCondition(),
-                current.getFormatedPathCondition())) {
+            current.getFormatedPathCondition())) {
             assertEquals(expected.getFormatedPathCondition(), current.getFormatedPathCondition());
         }
         if (compareParent) {
             if (expected instanceof IExecutionBlockStartNode<?>) {
                 assertTrue(current instanceof IExecutionBlockStartNode<?>);
                 assertEquals(((IExecutionBlockStartNode<?>) expected).isBlockOpened(),
-                        ((IExecutionBlockStartNode<?>) current).isBlockOpened());
+                    ((IExecutionBlockStartNode<?>) current).isBlockOpened());
                 assertBlockCompletions((IExecutionBlockStartNode<?>) expected,
-                        (IExecutionBlockStartNode<?>) current);
+                    (IExecutionBlockStartNode<?>) current);
             }
             assertCompletedBlocks(expected, current);
             assertOutgoingLinks(expected, current);
@@ -380,177 +377,177 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
         if (expected instanceof IExecutionBaseMethodReturn<?>) {
             assertTrue(current instanceof IExecutionBaseMethodReturn<?>);
             assertCallStateVariables((IExecutionBaseMethodReturn<?>) expected,
-                    (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
+                (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
         }
         if (expected instanceof IExecutionBranchCondition) {
             assertTrue(current instanceof IExecutionBranchCondition,
-                    "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
+                "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
-                            ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
-                    "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
-                            + "\" but is \""
-                            + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
+                    ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
+                "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
+                    + "\" but is \""
+                    + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
             assertEquals(((IExecutionBranchCondition) expected).isMergedBranchCondition(),
-                    ((IExecutionBranchCondition) current).isMergedBranchCondition());
+                ((IExecutionBranchCondition) current).isMergedBranchCondition());
             assertEquals(((IExecutionBranchCondition) expected).isBranchConditionComputed(),
-                    ((IExecutionBranchCondition) current).isBranchConditionComputed());
+                ((IExecutionBranchCondition) current).isBranchConditionComputed());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
-                            ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
-                    "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
-                            + "\" but is \""
-                            + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
+                    ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
+                "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
+                    + "\" but is \""
+                    + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStart) {
             assertTrue(current instanceof IExecutionStart, "Expected IExecutionStartNode but is "
-                    + current.getClass() + ".");
+                + current.getClass() + ".");
             assertTerminations((IExecutionStart) expected, (IExecutionStart) current);
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionTermination) {
             assertTrue(current instanceof IExecutionTermination,
-                    "Expected IExecutionTermination but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionTermination but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionTermination) expected).getTerminationKind(),
-                    ((IExecutionTermination) current).getTerminationKind());
+                ((IExecutionTermination) current).getTerminationKind());
             assertEquals(((IExecutionTermination) expected).isBranchVerified(),
-                    ((IExecutionTermination) current).isBranchVerified());
+                ((IExecutionTermination) current).isBranchVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionBranchStatement) {
             assertTrue(current instanceof IExecutionBranchStatement,
-                    "Expected IExecutionBranchStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionBranchStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopCondition) {
             assertTrue(current instanceof IExecutionLoopCondition,
-                    "Expected IExecutionLoopCondition but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopCondition but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopStatement) {
             assertTrue(current instanceof IExecutionLoopStatement,
-                    "Expected IExecutionLoopStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionMethodCall) {
             assertTrue(current instanceof IExecutionMethodCall,
-                    "Expected IExecutionMethodCall but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionMethodCall but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             assertMethodReturns((IExecutionMethodCall) expected, (IExecutionMethodCall) current);
         } else if (expected instanceof IExecutionMethodReturn) {
             assertTrue(current instanceof IExecutionMethodReturn,
-                    "Expected IExecutionMethodReturn but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionMethodReturn but is "
+                    + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
-                            ((IExecutionMethodReturn) current).getSignature()),
-                    ((IExecutionMethodReturn) expected).getSignature() + " does not match "
-                            + ((IExecutionMethodReturn) current).getSignature());
+                StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
+                    ((IExecutionMethodReturn) current).getSignature()),
+                ((IExecutionMethodReturn) expected).getSignature() + " does not match "
+                    + ((IExecutionMethodReturn) current).getSignature());
             if (compareReturnValues) {
                 assertTrue(
-                        StringUtil.equalIgnoreWhiteSpace(
-                                ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
-                                ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
-                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
-                                + " does not match "
-                                + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
+                    StringUtil.equalIgnoreWhiteSpace(
+                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
+                        ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
+                    ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
+                        + " does not match "
+                        + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
                 assertTrue(
-                        StringUtil.equalIgnoreWhiteSpace(
-                                ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
-                                ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
-                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
-                                + " does not match "
-                                + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
+                    StringUtil.equalIgnoreWhiteSpace(
+                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
+                        ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
+                    ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
+                        + " does not match "
+                        + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
                 assertEquals(((IExecutionMethodReturn) expected).isReturnValuesComputed(),
-                        ((IExecutionMethodReturn) current).isReturnValuesComputed());
+                    ((IExecutionMethodReturn) current).isReturnValuesComputed());
             }
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
+                StringUtil.equalIgnoreWhiteSpace(
                     ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition(),
                     ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition()
-                            + " does not match "
+                    + " does not match "
                     + ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             if (compareReturnValues) {
                 assertReturnValues(((IExecutionMethodReturn) expected).getReturnValues(),
-                        ((IExecutionMethodReturn) current).getReturnValues());
+                    ((IExecutionMethodReturn) current).getReturnValues());
             }
         } else if (expected instanceof IExecutionExceptionalMethodReturn) {
             assertTrue(current instanceof IExecutionExceptionalMethodReturn,
-                    "Expected IExecutionExceptionalMethodReturn but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionExceptionalMethodReturn but is "
+                    + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionExceptionalMethodReturn) expected).getSignature(),
-                            ((IExecutionExceptionalMethodReturn) current).getSignature()),
-                    ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
-                            + ((IExecutionExceptionalMethodReturn) current).getSignature());
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionExceptionalMethodReturn) expected).getSignature(),
+                    ((IExecutionExceptionalMethodReturn) current).getSignature()),
+                ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
+                    + ((IExecutionExceptionalMethodReturn) current).getSignature());
             assertTrue(StringUtil.equalIgnoreWhiteSpace(
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition(),
                 ((IExecutionExceptionalMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition()
-                            + " does not match " + ((IExecutionExceptionalMethodReturn) current)
+                    + " does not match " + ((IExecutionExceptionalMethodReturn) current)
                             .getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStatement) {
             assertTrue(current instanceof IExecutionStatement,
-                    "Expected IExecutionStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionOperationContract) {
             assertTrue(current instanceof IExecutionOperationContract,
-                    "Expected IExecutionOperationContract but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionOperationContract but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionOperationContract) expected).isPreconditionComplied(),
-                    ((IExecutionOperationContract) current).isPreconditionComplied());
+                ((IExecutionOperationContract) current).isPreconditionComplied());
             assertEquals(((IExecutionOperationContract) expected).hasNotNullCheck(),
-                    ((IExecutionOperationContract) current).hasNotNullCheck());
+                ((IExecutionOperationContract) current).hasNotNullCheck());
             assertEquals(((IExecutionOperationContract) expected).isNotNullCheckComplied(),
-                    ((IExecutionOperationContract) current).isNotNullCheckComplied());
+                ((IExecutionOperationContract) current).isNotNullCheckComplied());
             assertEquals(((IExecutionOperationContract) expected).getFormatedResultTerm(),
-                    ((IExecutionOperationContract) current).getFormatedResultTerm());
+                ((IExecutionOperationContract) current).getFormatedResultTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedExceptionTerm(),
-                    ((IExecutionOperationContract) current).getFormatedExceptionTerm());
+                ((IExecutionOperationContract) current).getFormatedExceptionTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedSelfTerm(),
-                    ((IExecutionOperationContract) current).getFormatedSelfTerm());
+                ((IExecutionOperationContract) current).getFormatedSelfTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedContractParams(),
-                    ((IExecutionOperationContract) current).getFormatedContractParams());
+                ((IExecutionOperationContract) current).getFormatedContractParams());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopInvariant) {
             assertTrue(current instanceof IExecutionLoopInvariant,
-                    "Expected IExecutionLoopInvariant but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopInvariant but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionLoopInvariant) expected).isInitiallyValid(),
-                    ((IExecutionLoopInvariant) current).isInitiallyValid());
+                ((IExecutionLoopInvariant) current).isInitiallyValid());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionAuxiliaryContract) {
             assertTrue(current instanceof IExecutionAuxiliaryContract,
-                    "Expected IExecutionBlockContract but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionBlockContract but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionAuxiliaryContract) expected).isPreconditionComplied(),
-                    ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
+                ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionJoin) {
             assertTrue(current instanceof IExecutionJoin, "Expected IExecutionJoin but is "
-                    + current.getClass() + ".");
+                + current.getClass() + ".");
             assertEquals(((IExecutionJoin) expected).isWeakeningVerified(),
-                    ((IExecutionJoin) current).isWeakeningVerified());
+                ((IExecutionJoin) current).isWeakeningVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else {
@@ -562,22 +559,22 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
             IExecutionNode<?>[] currentStack = current.getCallStack();
             if (expectedStack != null) {
                 assertNotNull(currentStack,
-                        "Call stack of \"" + current + "\" should not be null.");
+                    "Call stack of \"" + current + "\" should not be null.");
                 assertEquals(expectedStack.length, currentStack.length, "Node: " + expected);
                 for (int i = 0; i < expectedStack.length; i++) {
                     assertExecutionNode(expectedStack[i], currentStack[i], false, false, false,
-                            false, false);
+                        false, false);
                 }
             } else {
                 assertTrue(currentStack == null || currentStack.length == 0,
-                        "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
-                                + "\" but should be null or empty.");
+                    "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
+                        + "\" but should be null or empty.");
             }
         }
         // Optionally compare parent
         if (compareParent) {
             assertExecutionNode(expected, current, false, compareVariables, compareCallStack,
-                    compareReturnValues, compareConstraints);
+                compareReturnValues, compareConstraints);
         }
     }
 
@@ -585,7 +582,7 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
      * Compares the outgoing links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -594,9 +591,9 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getOutgoingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Outgoing links of \"" + current + "\" should not be null.");
+                "Outgoing links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                    "Outgoing links: " + expected);
+                "Outgoing links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -604,15 +601,15 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                        false, false, false);
+                    false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                        false, false, false);
+                    false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Outgoing links of \""
-                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -620,7 +617,7 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
      * Compares the incoming links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -629,9 +626,9 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getIncomingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Incoming links of \"" + current + "\" should not be null.");
+                "Incoming links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                    "Incoming links: " + expected);
+                "Incoming links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -639,15 +636,15 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                        false, false, false);
+                    false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                        false, false, false);
+                    false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Incoming links of \""
-                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -655,29 +652,29 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
      * Compares the completed blocks.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCompletedBlocks(IExecutionNode<?> expected,
-                                                IExecutionNode<?> current) throws ProofInputException {
+            IExecutionNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionBlockStartNode<?>> expectedEntries = expected.getCompletedBlocks();
         ImmutableList<IExecutionBlockStartNode<?>> currentEntries = current.getCompletedBlocks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Completed blocks of \"" + current + "\" should not be null.");
+                "Completed blocks of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBlockStartNode<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionBlockStartNode<?>> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionBlockStartNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionBlockStartNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, false, false,
-                        false, false, false);
+                    false, false, false);
                 String expectedCondition =
-                        expected.getFormatedBlockCompletionCondition(expectedNext);
+                    expected.getFormatedBlockCompletionCondition(expectedNext);
                 String currentCondition = current.getFormatedBlockCompletionCondition(currentNext);
                 if (!StringUtil.equalIgnoreWhiteSpace(expectedCondition, currentCondition)) {
                     assertEquals(expectedCondition, currentCondition);
@@ -687,8 +684,8 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Completed block entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Completed block entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -696,33 +693,33 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
      * Compares the block completions.
      *
      * @param expected The expected {@link IExecutionBlockStartNode}.
-     * @param current  The current {@link IExecutionBlockStartNode}.
+     * @param current The current {@link IExecutionBlockStartNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expected,
-                                                 IExecutionBlockStartNode<?> current) throws ProofInputException {
+            IExecutionBlockStartNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionNode<?>> expectedEntries = expected.getBlockCompletions();
         ImmutableList<IExecutionNode<?>> currentEntries = current.getBlockCompletions();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Block completions of \"" + current + "\" should not be null.");
+                "Block completions of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionNode<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionNode<?>> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Block completion entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Block completion entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -730,34 +727,34 @@ protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expecte
      * Compares the method returns.
      *
      * @param expected The expected {@link IExecutionMethodCall}.
-     * @param current  The current {@link IExecutionMethodCall}.
+     * @param current The current {@link IExecutionMethodCall}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertMethodReturns(IExecutionMethodCall expected,
-                                              IExecutionMethodCall current) throws ProofInputException {
+            IExecutionMethodCall current) throws ProofInputException {
         ImmutableList<IExecutionBaseMethodReturn<?>> expectedEntries = expected.getMethodReturns();
         ImmutableList<IExecutionBaseMethodReturn<?>> currentEntries = current.getMethodReturns();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Method return of \"" + current + "\" should not be null.");
+                "Method return of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBaseMethodReturn<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionBaseMethodReturn<?>> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Method return entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Method return entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -765,7 +762,7 @@ protected static void assertMethodReturns(IExecutionMethodCall expected,
      * Compares the terminations.
      *
      * @param expected The expected {@link IExecutionStart}.
-     * @param current  The current {@link IExecutionStart}.
+     * @param current The current {@link IExecutionStart}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertTerminations(IExecutionStart expected, IExecutionStart current)
@@ -776,22 +773,22 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
             assertNotNull(currentEntries, "Termination of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionTermination> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionTermination> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Termination entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Termination entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -799,11 +796,11 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
      * Makes sure that the given nodes contains the same {@link IExecutionMethodReturnValue}s.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}s.
-     * @param current  The current {@link IExecutionMethodReturnValue}s.
+     * @param current The current {@link IExecutionMethodReturnValue}s.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
-                                             IExecutionMethodReturnValue[] current) throws ProofInputException {
+            IExecutionMethodReturnValue[] current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertEquals(expected.length, current.length);
@@ -816,36 +813,36 @@ protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
      * Makes sure that the given {@link IExecutionMethodReturnValue}s are the same.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}.
-     * @param current  The current {@link IExecutionMethodReturnValue}.
+     * @param current The current {@link IExecutionMethodReturnValue}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValue(IExecutionMethodReturnValue expected,
-                                            IExecutionMethodReturnValue current) throws ProofInputException {
+            IExecutionMethodReturnValue current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                expected.getName() + " does not match " + current.getName());
+            expected.getName() + " does not match " + current.getName());
         assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
-                        current.getReturnValueString()),
-                expected.getReturnValueString() + " does not match " + current.getReturnValueString());
+            StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
+                current.getReturnValueString()),
+            expected.getReturnValueString() + " does not match " + current.getReturnValueString());
         assertEquals(expected.hasCondition(), current.hasCondition());
         assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                        current.getConditionString()),
-                expected.getConditionString() + " does not match " + current.getConditionString());
+            StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                current.getConditionString()),
+            expected.getConditionString() + " does not match " + current.getConditionString());
     }
 
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionNode}s.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
+     * @param expected The expected node.
+     * @param current The current node.
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                            boolean compareConstraints) throws ProofInputException {
+            boolean compareConstraints) throws ProofInputException {
         if (compareConstraints) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -859,26 +856,26 @@ protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNo
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraints.
-     * @param current  The current constraints.
+     * @param current The current constraints.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionConstraint[] expected,
-                                            IExecutionConstraint[] current) throws ProofInputException {
+            IExecutionConstraint[] current) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionConstraint> availableCurrentVariables =
-                new ArrayList<>(Arrays.asList(current));
+            new ArrayList<>(Arrays.asList(current));
         for (final IExecutionConstraint expectedVariable : expected) {
             // Find current variable with same name
             IExecutionConstraint currentVariable = CollectionUtil.searchAndRemove(
-                    availableCurrentVariables, element -> {
-                        try {
-                            return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName());
-                        } catch (ProofInputException e) {
-                            throw new RuntimeException(e);
-                        }
-                    });
+                availableCurrentVariables, element -> {
+                    try {
+                        return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
+                            element.getName());
+                    } catch (ProofInputException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
             assertNotNull(currentVariable);
             // Compare variables
             assertConstraint(expectedVariable, currentVariable);
@@ -890,11 +887,11 @@ protected static void assertConstraints(IExecutionConstraint[] expected,
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraint.
-     * @param current  The current constraint.
+     * @param current The current constraint.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraint(IExecutionConstraint expected,
-                                           IExecutionConstraint current) throws ProofInputException {
+            IExecutionConstraint current) throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             if (!StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName())) {
@@ -909,15 +906,15 @@ protected static void assertConstraint(IExecutionConstraint expected,
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s of the call
      * state.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
-     * @param compareVariables   Compare variables?
+     * @param expected The expected node.
+     * @param current The current node.
+     * @param compareVariables Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> expected,
-                                                   IExecutionBaseMethodReturn<?> current, boolean compareVariables,
-                                                   boolean compareConstraints) throws ProofInputException {
+            IExecutionBaseMethodReturn<?> current, boolean compareVariables,
+            boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -930,14 +927,14 @@ protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> exp
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
-     * @param compareVariables   Compare variables?
+     * @param expected The expected node.
+     * @param current The current node.
+     * @param compareVariables Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                          boolean compareVariables, boolean compareConstraints) throws ProofInputException {
+            boolean compareVariables, boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -950,27 +947,27 @@ protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected           The expected variables.
-     * @param current            The current variables.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variables.
+     * @param current The current variables.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionVariable[] expected,
-                                          IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
-                                          boolean compareConstraints) throws ProofInputException {
+            IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
+            boolean compareConstraints) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionVariable> availableCurrentVariables =
-                new ArrayList<>(Arrays.asList(current));
+            new ArrayList<>(Arrays.asList(current));
         for (final IExecutionVariable expectedVariable : expected) {
             // Find current variable with same name
             IExecutionVariable currentVariable = CollectionUtil
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName());
+                                element.getName());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -978,7 +975,7 @@ protected static void assertVariables(IExecutionVariable[] expected,
             assertNotNull(currentVariable);
             // Compare variables
             assertVariable(expectedVariable, currentVariable, compareParent, compareChildren,
-                    compareConstraints);
+                compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -986,15 +983,15 @@ protected static void assertVariables(IExecutionVariable[] expected,
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected           The expected variable.
-     * @param current            The current variable.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variable.
+     * @param current The current variable.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariable(IExecutionVariable expected, IExecutionVariable current,
-                                         boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
@@ -1005,7 +1002,7 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
             // Compare parent
             if (compareParent) {
                 assertValue(expected.getParentValue(), current.getParentValue(), false, false,
-                        false);
+                    false);
             }
             // Compare children
             if (compareChildren) {
@@ -1021,15 +1018,15 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected           The expected values.
-     * @param current            The current values.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected values.
+     * @param current The current values.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValues(IExecutionValue[] expected, IExecutionValue[] current,
-                                       boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
@@ -1040,10 +1037,10 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName())
+                                element.getName())
                                     && StringUtil.equalIgnoreWhiteSpace(
-                                    expectedVariable.getConditionString(),
-                                    element.getConditionString());
+                                        expectedVariable.getConditionString(),
+                                        element.getConditionString());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -1051,7 +1048,7 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
             assertNotNull(currentVariable);
             // Compare variables
             assertValue(expectedVariable, currentVariable, compareParent, compareChildren,
-                    compareConstraints);
+                compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -1059,43 +1056,43 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected           The expected variable.
-     * @param current            The current variable.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variable.
+     * @param current The current variable.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValue(IExecutionValue expected, IExecutionValue current,
-                                      boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             // Compare variable
             assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                    expected.getName() + " does not match " + current.getName());
+                expected.getName() + " does not match " + current.getName());
             assertEquals(expected.getTypeString(), current.getTypeString());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
-                            current.getValueString()),
-                    expected.getValueString() + " does not match " + current.getValueString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
+                    current.getValueString()),
+                expected.getValueString() + " does not match " + current.getValueString());
             assertEquals(expected.isValueAnObject(), current.isValueAnObject());
             assertEquals(expected.isValueUnknown(), current.isValueUnknown());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                            current.getConditionString()),
-                    expected.getConditionString() + " does not match " + current.getConditionString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                    current.getConditionString()),
+                expected.getConditionString() + " does not match " + current.getConditionString());
             // Compare parent
             if (compareParent) {
                 assertVariable(expected.getVariable(), current.getVariable(), false, false,
-                        compareConstraints);
+                    compareConstraints);
             }
             // Compare children
             if (compareChildren) {
                 IExecutionVariable[] expectedChildVariables = expected.getChildVariables();
                 IExecutionVariable[] currentChildVariables = current.getChildVariables();
                 assertVariables(expectedChildVariables, currentChildVariables, compareParent,
-                        compareChildren, compareConstraints);
+                    compareChildren, compareConstraints);
             }
             // Compare constraints
             if (compareConstraints) {
@@ -1112,27 +1109,27 @@ protected static void assertValue(IExecutionValue expected, IExecutionValue curr
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepReturn(DefaultUserInterfaceControl ui,
-                                     SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                     String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
@@ -1142,8 +1139,9 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1154,27 +1152,27 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
-                                                    SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                                    String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         stopCondition.addChildren(lineBreakpoints);
         proof.getSettings().getStrategySettings()
@@ -1185,8 +1183,9 @@ protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1196,27 +1195,27 @@ protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
      * Executes a "step over" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepOver(DefaultUserInterfaceControl ui,
-                                   SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                   String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepOverSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
@@ -1226,8 +1225,9 @@ protected static void stepOver(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1237,28 +1237,28 @@ protected static void stepOver(DefaultUserInterfaceControl ui,
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
      * @return The found {@link SymbolicExecutionCompletions}.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceControl ui,
-                                                           SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                                           String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
@@ -1268,8 +1268,9 @@ protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceContr
             // Update symbolic execution tree
             SymbolicExecutionCompletions completions = builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
             return completions;
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
@@ -1280,24 +1281,24 @@ protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceContr
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void resume(DefaultUserInterfaceControl ui,
-                                 SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
@@ -1316,20 +1317,20 @@ protected static void resume(DefaultUserInterfaceControl ui,
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-                                                 String oraclePathInBaseDirFile, File baseDir)
+            String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         if (CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
             createOracleFile(builder.getStartNode(), oraclePathInBaseDirFile, false, false, false,
-                    false);
+                false);
         } else {
             // Read oracle file
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
@@ -1338,41 +1339,41 @@ protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builde
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, builder.getStartNode(), false, false, false, false,
-                    false);
+                false);
         }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-                                                 String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
-                                                 File baseDir)
+            String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
+            File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         assertSetTreeAfterStep(builder,
-                oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
+            oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
     }
 
     /**
      * Searches a {@link IProgramMethod} in the given {@link Services}.
      *
-     * @param services          The {@link Services} to search in.
+     * @param services The {@link Services} to search in.
      * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName    The method name to search.
+     * @param methodFullName The method name to search.
      * @return The first found {@link IProgramMethod} in the type.
      */
     public static IProgramMethod searchProgramMethod(Services services, String containerTypeName,
-                                                     final String methodFullName) {
+            final String methodFullName) {
         return HelperClassForTests.searchProgramMethod(services, containerTypeName, methodFullName);
     }
 
@@ -1381,29 +1382,29 @@ public static IProgramMethod searchProgramMethod(Services services, String conta
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param baseContractName                    The name of the contract.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param baseContractName The name of the contract.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String baseContractName,
@@ -1417,26 +1418,26 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
-                null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
+            null, null, null, true);
         setupTacletOptions(environment);
         // Start proof
         final Contract contract = environment.getServices().getSpecificationRepository()
                 .getContractByName(baseContractName);
         assertTrue(contract instanceof FunctionalOperationContract);
         ProofOblInput input = new FunctionalOperationContractPO(environment.getInitConfig(),
-                (FunctionalOperationContract) contract, true, true);
+            (FunctionalOperationContract) contract, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1448,30 +1449,30 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The name of the type which contains the method.
-     * @param methodFullName                      The method name to search.
-     * @param precondition                        An optional precondition to use.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The name of the type which contains the method.
+     * @param methodFullName The method name to search.
+     * @param precondition An optional precondition to use.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1485,25 +1486,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodPO(environment.getInitConfig(), pm.getFullName(), pm,
-                precondition, true, true);
+            precondition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1526,26 +1527,26 @@ private static void setupTacletOptions(KeYEnvironment<?> env) {
      * Creates a {@link SymbolicExecutionEnvironment} which consists of loading a proof file to load
      * and creation with configuration of {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofPathInBaseDir                  The path to the proof file inside the base directory.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofPathInBaseDir The path to the proof file inside the base directory.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
      */
@@ -1562,20 +1563,20 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(proofFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
-                null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
+            null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
         setupTacletOptions(environment);
         Proof proof = environment.getLoadedProof();
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1587,32 +1588,32 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The name of the type which contains the method.
-     * @param methodFullName                      The method name to search.
-     * @param precondition                        An optional precondition to use.
-     * @param startPosition                       The start position.
-     * @param endPosition                         The end position.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The name of the type which contains the method.
+     * @param methodFullName The method name to search.
+     * @param precondition An optional precondition to use.
+     * @param startPosition The start position.
+     * @param endPosition The end position.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1627,25 +1628,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodSubsetPO(environment.getInitConfig(), methodFullName,
-                pm, precondition, startPosition, endPosition, true, true);
+            pm, precondition, startPosition, endPosition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1670,7 +1671,7 @@ protected String getTryContent(Proof proof) {
         JavaProgramElement updateContent = updateApplication.subs().get(1).javaBlock().program();
         assertTrue(updateContent instanceof StatementBlock);
         ImmutableArray<? extends Statement> updateContentBody =
-                ((StatementBlock) updateContent).getBody();
+            ((StatementBlock) updateContent).getBody();
         assertEquals(2, updateContentBody.size());
         assertTrue(updateContentBody.get(1) instanceof Try);
         Try tryStatement = (Try) updateContentBody.get(1);
@@ -1681,39 +1682,39 @@ protected String getTryContent(Proof proof) {
     /**
      * Makes sure that the save and loading process works.
      *
-     * @param baseDir                 The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir       The path to the java file inside the base directory.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param env                     The already executed {@link SymbolicExecutionEnvironment} which contains the proof
-     *                                to save/load.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param env The already executed {@link SymbolicExecutionEnvironment} which contains the proof
+     *        to save/load.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
-                                       String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
+            String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         File javaFile = new File(baseDir, javaPathInBaseDir);
         assertTrue(javaFile.exists());
         File tempFile =
-                File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
+            File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
         KeYEnvironment<DefaultUserInterfaceControl> reloadedEnv = null;
         SymbolicExecutionTreeBuilder reloadedBuilder = null;
         try {
             ProofSaver saver = new ProofSaver(env.getProof(), tempFile.getAbsolutePath(),
-                    KeYConstants.INTERNAL_VERSION);
+                KeYConstants.INTERNAL_VERSION);
             assertNull(saver.save());
             // Load proof from saved *.proof file
             reloadedEnv = KeYEnvironment.load(SymbolicExecutionJavaProfile.getDefaultInstance(),
-                    tempFile, null, null, null, true);
+                tempFile, null, null, null, true);
             Proof reloadedProof = reloadedEnv.getLoadedProof();
             assertNotSame(env.getProof(), reloadedProof);
             // Recreate symbolic execution tree
             reloadedBuilder =
-                    new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
+                new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
             SymbolicExecutionUtil.initializeStrategy(reloadedBuilder);
             reloadedBuilder.analyse();
             assertSetTreeAfterStep(reloadedBuilder, oraclePathInBaseDirFile, baseDir);
@@ -1742,59 +1743,59 @@ protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                               The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                     The path to the java file inside the base directory.
-     * @param containerTypeName                     The java class to test.
-     * @param methodFullName                        The method to test.
-     * @param precondition                          An optional precondition.
-     * @param oraclePathInBaseDirFile               The path to the oracle file inside the base directory.
-     * @param includeConstraints                    Include constraints?
-     * @param includeVariables                      Include variables?
-     * @param includeCallStack                      Include call stack?
-     * @param includeReturnValues                   Include method return values?
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
      * @param maximalNumberOfExecutedSetNodesPerRun The number of executed set nodes per auto mode
-     *                                              run. The whole test is executed for each defined value.
-     * @param mergeBranchConditions                 Merge branch conditions?
-     * @param useOperationContracts                 Use operation contracts?
-     * @param useLoopInvariants                     Use loop invariants?
-     * @param blockTreatmentContract                Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs    {@code true} hide non execution branch labels by
-     *                                              side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                           Do alias checks?
-     * @param useUnicode                            {@code true} use unicode characters, {@code false} do not use unicode
-     *                                              characters.
-     * @param usePrettyPrinting                     {@code true} use pretty printing, {@code false} do not use pretty
-     *                                              printing.
-     * @param variablesAreOnlyComputedFromUpdates   {@code true} {@link IExecutionVariable} are only
-     *                                              computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                              according to the type structure of the visible memory.
-     * @param simplifyConditions                    {@code true} simplify conditions, {@code false} do not simplify
-     *                                              conditions.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        run. The whole test is executed for each defined value.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
+     * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTest(File baseDir, String javaPathInBaseDir, String containerTypeName,
-                             String methodFullName, String precondition, String oraclePathInBaseDirFile,
-                             boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                             boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
-                             boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-                             boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                             boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                             boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String methodFullName, String precondition, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
+            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         assertNotNull(maximalNumberOfExecutedSetNodesPerRun);
         for (int j : maximalNumberOfExecutedSetNodesPerRun) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env = doSETTest(baseDir,
-                    javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                    oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                    includeReturnValues, j,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                includeReturnValues, j,
+                mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
             env.dispose();
         }
     }
@@ -1803,57 +1804,57 @@ protected void doSETTest(File baseDir, String javaPathInBaseDir, String containe
      * Executes method <code>doTest</code>
      * and disposes the created {@link SymbolicExecutionEnvironment}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The java class to test.
-     * @param methodFullName                      The method to test.
-     * @param precondition                        An optional precondition.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
-                                       String containerTypeName, String methodFullName, String precondition,
-                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-                                       boolean includeCallStack, boolean includeReturnValues,
-                                       int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-                                       boolean useOperationContracts, boolean useLoopInvariants,
-                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                       boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String containerTypeName, String methodFullName, String precondition,
+            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+            boolean includeCallStack, boolean includeReturnValues,
+            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                        oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                        includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
-                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                        variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                variablesAreOnlyComputedFromUpdates, simplifyConditions);
         env.dispose();
     }
 
@@ -1870,47 +1871,47 @@ protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
-                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-                                       boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
-                                       boolean useOperationContracts, boolean useLoopInvariants,
-                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                       boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
+            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+            boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
-                        includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
-                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                        variablesAreOnlyComputedFromUpdates, false, true);
+            doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
+                includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                variablesAreOnlyComputedFromUpdates, false, true);
         if (env != null) {
             env.dispose();
         }
@@ -1929,47 +1930,47 @@ protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
-                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                                                                  boolean includeReturnValues, boolean mergeBranchConditions,
-                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
+            String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+            boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         boolean originalOneStepSimplification = isOneStepSimplificationEnabled(null);
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env;
@@ -1980,26 +1981,26 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             // Make sure that the correct taclet options are defined.
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             env = createSymbolicExecutionEnvironment(baseDir, proofFilePathInBaseDir,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
-                    simplifyConditions);
+                mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
+                simplifyConditions);
             // Create new oracle file if required in a temporary directory
             createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                    includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
             // Read oracle file
             ExecutionNodeReader reader = new ExecutionNodeReader();
             IExecutionNode<?> oracleRoot = reader.read(oracleFile);
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                    includeCallStack, false, includeReturnValues, includeConstraints);
+                includeCallStack, false, includeReturnValues, includeConstraints);
             return env;
         } finally {
             // Restore original options
@@ -2020,49 +2021,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The java class to test.
-     * @param methodFullName                      The method to test.
-     * @param precondition                        An optional precondition.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String javaPathInBaseDir, String containerTypeName, final String methodFullName,
-                                                                                  String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
-                                                                                  boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
-                                                                                  int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String javaPathInBaseDir, String containerTypeName, final String methodFullName,
+            String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
+            boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
+            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
@@ -2076,23 +2077,23 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions = setDefaultTacletOptions(baseDir, javaPathInBaseDir,
-                    containerTypeName, methodFullName);
+                containerTypeName, methodFullName);
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                            methodFullName, precondition, mergeBranchConditions, useOperationContracts,
-                            useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
-                            aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                            simplifyConditions);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                    methodFullName, precondition, mergeBranchConditions, useOperationContracts,
+                    useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
+                    aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                    simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                    includeCallStack, includeReturnValues);
+                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore original options
@@ -2114,49 +2115,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param baseContractName                    The name of the contract.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param baseContractName The name of the contract.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
-                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                                                                  boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
-                                                                                  boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
+            String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
+            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+            boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
         try {
@@ -2167,22 +2168,22 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions =
-                    setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
+                setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
-                            mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                            blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
-                            useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                            truthValueEvaluationEnabled, simplifyConditions);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
+                    useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                    truthValueEvaluationEnabled, simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                    includeCallStack, includeReturnValues);
+                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore taclet options
@@ -2194,15 +2195,15 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * Internal test method
      */
     private void internalDoSETTest(File oracleFile,
-                                   SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
-                                   String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
-                                   boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                   boolean includeReturnValues)
+            SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
+            String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
         env.getProof().getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         int nodeCount;
@@ -2218,11 +2219,12 @@ private void internalDoSETTest(File oracleFile,
                 // Update symbolic execution tree
                 env.getBuilder().analyse();
                 // Make sure that not to many set nodes are executed
-                Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
+                Map<Goal, Integer> executedSetNodesPerGoal =
+                    stopCondition.getExectuedSetNodesPerGoal();
                 for (Integer value : executedSetNodesPerGoal.values()) {
                     assertNotNull(value);
                     assertTrue(value <= maximalNumberOfExecutedSetNodes,
-                            value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+                        value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
                 }
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
@@ -2230,36 +2232,36 @@ private void internalDoSETTest(File oracleFile,
         } while (stopCondition.wasSetNodeExecuted() && nodeCount != env.getProof().countNodes());
         // Create new oracle file if required in a temporary directory
         createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+            includeConstraints, includeVariables, includeCallStack, includeReturnValues);
         // Read oracle file
         ExecutionNodeReader reader = new ExecutionNodeReader();
         IExecutionNode<?> oracleRoot = reader.read(oracleFile);
         assertNotNull(oracleRoot);
         // Make sure that the created symbolic execution tree matches the expected one.
         assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                includeCallStack, false, includeReturnValues, includeConstraints);
+            includeCallStack, false, includeReturnValues, includeConstraints);
     }
 
     /**
      * Ensures that the default taclet options are defined.
      *
      * @param javaPathInBaseDir The path in the base directory to the java file.
-     * @param baseContractName  The name of the contract to prove.
+     * @param baseContractName The name of the contract to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseDir,
-                                                              String baseContractName)
+            String baseContractName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
-                            baseContractName,
-                            false, false, false,
-                            false, false, false,
-                            false, false, false,
-                            false, false);
+                createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
+                    baseContractName,
+                    false, false, false,
+                    false, false, false,
+                    false, false, false,
+                    false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2268,26 +2270,26 @@ public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseD
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param baseDir           The base directory which contains the java file.
+     * @param baseDir The base directory which contains the java file.
      * @param javaPathInBaseDir The path in the base directory to the java file.
      * @param containerTypeName name of the type where the method is implemented/declared
-     * @param methodFullName    The method to prove.
+     * @param methodFullName The method to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(File baseDir,
-                                                              String javaPathInBaseDir,
-                                                              String containerTypeName,
-                                                              String methodFullName)
+            String javaPathInBaseDir,
+            String containerTypeName,
+            String methodFullName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                            methodFullName,
-                            null, false, false, false,
-                            false, false, false, false,
-                            false, false, false);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                    methodFullName,
+                    null, false, false, false,
+                    false, false, false, false,
+                    false, false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2296,19 +2298,19 @@ public static Map<String, String> setDefaultTacletOptions(File baseDir,
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param javaFile          The java file to load.
+     * @param javaFile The java file to load.
      * @param containerTypeName The type name which provides the target.
-     * @param targetName        The target to proof.
+     * @param targetName The target to proof.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     @SuppressWarnings("unused")
     public static Map<String, String> setDefaultTacletOptionsForTarget(File javaFile,
-                                                                       String containerTypeName, final String targetName)
+            String containerTypeName, final String targetName)
             throws ProblemLoaderException, ProofInputException {
         return HelperClassForTests.setDefaultTacletOptionsForTarget(javaFile, containerTypeName,
-                targetName);
+            targetName);
     }
 
     /**
@@ -2342,14 +2344,14 @@ public static void restoreTacletOptions(Map<String, String> options) {
     protected ITermProgramVariableCollectorFactory createNewProgramVariableCollectorFactory(
             final SymbolicExecutionBreakpointStopCondition breakpointParentStopCondition) {
         return services -> new TermProgramVariableCollectorKeepUpdatesForBreakpointconditions(
-                services, breakpointParentStopCondition);
+            services, breakpointParentStopCondition);
     }
 
     /**
      * Makes sure that two {@link Term}s are equal.
      *
      * @param expected The expected {@link Term}.
-     * @param actual   The actual {@link Term}.
+     * @param actual The actual {@link Term}.
      */
     protected void assertTerm(Term expected, Term actual) {
         if (expected != null) {
@@ -2369,7 +2371,7 @@ protected void assertTerm(Term expected, Term actual) {
      * Checks if one-step simplification is enabled in the given {@link Proof}.
      *
      * @param proof The {@link Proof} to read from or {@code null} to return the general settings
-     *              value.
+     *        value.
      * @return {@code true} one step simplification is enabled, {@code false} if disabled.
      */
     public static boolean isOneStepSimplificationEnabled(Proof proof) {
@@ -2379,9 +2381,9 @@ public static boolean isOneStepSimplificationEnabled(Proof proof) {
     /**
      * Defines if one-step simplification is enabled in general and within the {@link Proof}.
      *
-     * @param proof   The optional {@link Proof}.
+     * @param proof The optional {@link Proof}.
      * @param enabled {@code true} use one-step simplification, {@code false} do not use one-step
-     *                simplification.
+     *        simplification.
      */
     public static void setOneStepSimplificationEnabled(Proof proof, boolean enabled) {
         HelperClassForTests.setOneStepSimplificationEnabled(proof, enabled);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
index 29a34424d09..e466b3e4876 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
@@ -564,7 +564,8 @@ public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException {
+    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
+            throws InterruptedException {
         startAutoMode(proof, goals);
         waitWhileAutoMode();
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
index 48dda5aa1f3..00a423b76c5 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 import de.uka.ilkd.key.logic.PosInOccurrence;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -16,10 +19,8 @@
 import de.uka.ilkd.key.prover.impl.ApplyStrategy;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
 import de.uka.ilkd.key.util.ProofStarter;
-import org.key_project.util.collection.ImmutableList;
 
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
+import org.key_project.util.collection.ImmutableList;
 
 /**
  * The default implementation of {@link ProofControl}.
@@ -45,12 +46,12 @@ public class DefaultProofControl extends AbstractProofControl {
     /**
      * Constructor.
      *
-     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *                                  to all started {@link ApplyStrategy} instances.
+     *        to all started {@link ApplyStrategy} instances.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-                               DefaultUserInterfaceControl defaultProverTaskListener) {
+            DefaultUserInterfaceControl defaultProverTaskListener) {
         super(defaultProverTaskListener);
         this.ui = ui;
     }
@@ -58,21 +59,21 @@ public DefaultProofControl(UserInterfaceControl ui,
     /**
      * Constructor.
      *
-     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *                                  to all started {@link ApplyStrategy} instances.
-     * @param ruleCompletionHandler     An optional {@link RuleCompletionHandler}.
+     *        to all started {@link ApplyStrategy} instances.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-                               DefaultUserInterfaceControl defaultProverTaskListener,
-                               RuleCompletionHandler ruleCompletionHandler) {
+            DefaultUserInterfaceControl defaultProverTaskListener,
+            RuleCompletionHandler ruleCompletionHandler) {
         super(defaultProverTaskListener, ruleCompletionHandler);
         this.ui = ui;
     }
 
     @Override
     public synchronized void startAutoMode(Proof proof, ImmutableList<Goal> goals,
-                                           ProverTaskListener ptl) {
+            ProverTaskListener ptl) {
         if (!isInAutoMode()) {
             autoModeThread = new AutoModeThread(proof, goals, ptl);
             autoModeThread.start();
@@ -121,7 +122,7 @@ public void run() {
                 fireAutoModeStarted(new ProofEvent(proof));
                 ProofStarter starter = ptl != null
                         ? new ProofStarter(
-                        new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
+                            new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
                         : new ProofStarter(getDefaultProverTaskListener(), false);
                 starter.init(proof);
                 if (goals != null) {
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index dc2936d64e7..c791034caa9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -3,6 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
+import java.io.File;
+import java.util.*;
+import java.util.function.Consumer;
+
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.abstraction.KeYJavaType;
@@ -21,11 +25,8 @@
 import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.util.KeYTypeUtil;
 import de.uka.ilkd.key.util.Pair;
-import org.key_project.util.collection.ImmutableSet;
 
-import java.io.File;
-import java.util.*;
-import java.util.function.Consumer;
+import org.key_project.util.collection.ImmutableSet;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification
@@ -67,7 +68,7 @@ public class KeYEnvironment<U extends UserInterfaceControl> {
     /**
      * Constructor
      *
-     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig) {
@@ -77,11 +78,11 @@ public KeYEnvironment(U ui, InitConfig initConfig) {
     /**
      * Constructor
      *
-     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig, Proof loadedProof,
-                          Pair<String, Location> proofScript, ReplayResult replayResult) {
+            Pair<String, Location> proofScript, ReplayResult replayResult) {
         this.ui = ui;
         this.initConfig = initConfig;
         this.loadedProof = loadedProof;
@@ -180,15 +181,15 @@ public Proof createProof(ProofOblInput input) throws ProofInputException {
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location      The location to load.
-     * @param classPaths    The class path entries to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
      * @param bootClassPath The boot class path to use.
-     * @param includes      Optional includes to consider.
+     * @param includes Optional includes to consider.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes)
+            List<File> classPaths, File bootClassPath, List<File> includes)
             throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, false);
     }
@@ -197,103 +198,103 @@ public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location              The location to load.
-     * @param classPaths            The class path entries to use.
-     * @param bootClassPath         The boot class path to use.
-     * @param includes              Optional includes to consider.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
      * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, null,
-                ruleCompletionHandler, false);
+            ruleCompletionHandler, false);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as
-     *                                   {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
-     *                                   will be used for new proofs.
+     *        {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
+     *        will be used for new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, null, null,
-                forceNewProfileOfNewProofs);
+            forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
-     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
+     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *                                   new proofs.
+     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *        new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, poPropertiesToForce,
-                ruleCompletionHandler,
-                null, forceNewProfileOfNewProofs);
+            ruleCompletionHandler,
+            null, forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
-     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
-     * @param callbackProofLoaded        An optional callback (called when the proof is loaded, before
-     *                                   replay)
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
+     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     * @param callbackProofLoaded An optional callback (called when the proof is loaded, before
+     *        replay)
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *                                   new proofs.
+     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *        new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-                                                                   Consumer<Proof> callbackProofLoaded,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+            Consumer<Proof> callbackProofLoaded,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         DefaultUserInterfaceControl ui = new DefaultUserInterfaceControl(ruleCompletionHandler);
         AbstractProblemLoader loader = ui.load(profile, location, classPaths, bootClassPath,
-                includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
+            includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
         InitConfig initConfig = loader.getInitConfig();
 
         return new KeYEnvironment<>(ui, initConfig, loader.getProof(),
-                loader.getProofScript(), loader.getResult());
+            loader.getProofScript(), loader.getResult());
     }
 
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File keyFile)
@@ -335,9 +336,11 @@ public List<Contract> getAvailableContracts() {
         Set<KeYJavaType> kjts = getJavaInfo().getAllKeYJavaTypes();
         for (KeYJavaType type : kjts) {
             if (!KeYTypeUtil.isLibraryClass(type)) {
-                ImmutableSet<IObserverFunction> targets = getSpecificationRepository().getContractTargets(type);
+                ImmutableSet<IObserverFunction> targets =
+                    getSpecificationRepository().getContractTargets(type);
                 for (IObserverFunction target : targets) {
-                    ImmutableSet<Contract> contracts = getSpecificationRepository().getContracts(type, target);
+                    ImmutableSet<Contract> contracts =
+                        getSpecificationRepository().getContracts(type, target);
                     for (Contract contract : contracts) {
                         proofContracts.add(contract);
                     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index f30b7bb97d1..3b5971cbb72 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
@@ -123,7 +123,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode of.
      */
-    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals());}
+    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals()); }
 
     /**
      * Starts the auto mode for the given {@link Proof} and the given {@link Goal}s.
@@ -158,7 +158,8 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * @param proof The {@link Proof} to start auto mode and to wait for.
      * @param goals The {@link Goal}s to close.
      */
-    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException;
+    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
+            throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
index 29b9579f640..476d4ef1cb9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
@@ -18,7 +18,8 @@ public class ProofMacroFacade {
     private static ProofMacroFacade INSTANCE;
 
     public static ProofMacroFacade instance() {
-        if (INSTANCE == null) INSTANCE = new ProofMacroFacade();
+        if (INSTANCE == null)
+            INSTANCE = new ProofMacroFacade();
         return INSTANCE;
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
index ebe8d366f00..962228f3ca8 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
index 44a26161832..8414e89e769 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros.scripts;
 
-import de.uka.ilkd.key.smt.IllegalNumberException;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -25,7 +24,8 @@ public ProofScriptCommandFacade() {
     }
 
     public static ProofScriptCommandFacade instance() {
-        if(INSTANCE == null) INSTANCE = new ProofScriptCommandFacade();
+        if (INSTANCE == null)
+            INSTANCE = new ProofScriptCommandFacade();
         return INSTANCE;
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
index 6198a8b88d9..67415ae80fd 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
@@ -774,7 +774,7 @@ public List<Rule> getAvailableRules() {
             if (just == null) {
                 continue; // do not break system because of this
             }
-            s.add(app.taclet()); //TODO not good
+            s.add(app.taclet()); // TODO not good
         }
         return s;
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 95ba46fe7be..9676dc91980 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.proof;
 
+import java.util.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -24,15 +25,13 @@
 import de.uka.ilkd.key.rule.RuleApp;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.util.Pair;
+
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.lookup.Lookup;
 
-import java.util.*;
-import java.util.stream.Stream;
-
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -128,7 +127,7 @@ public class Node implements Iterable<Node> {
      * taclet with an addrule section on this node, then these taclets are stored in this list
      */
     private ImmutableSet<NoPosTacletApp> localIntroducedRules =
-            DefaultImmutableSet.nil();
+        DefaultImmutableSet.nil();
 
     /**
      * Holds the undo methods for the information added by rules to the {@code Goal.strategyInfos}.
@@ -459,7 +458,7 @@ List<Node> getLeaves() {
 
     /**
      * @return an iterator for the leaves of the subtree below this node. The computation is called
-     * at every call!
+     *         at every call!
      */
     public Iterator<Node> leavesIterator() {
         return new NodeIterator(getLeaves().iterator());
@@ -504,7 +503,7 @@ public Node child(int i) {
     /**
      * @param child a child of this node.
      * @return the number of the node <code>child</code>, if it is a child of this node (starting
-     * with <code>0</code>), <code>-1</code> otherwise
+     *         with <code>0</code>), <code>-1</code> otherwise
      */
     public int getChildNr(Node child) {
         int res = 0;
@@ -544,16 +543,16 @@ public StringBuffer getUniqueTacletId() {
      * Helper for {@link #toString()}
      *
      * @param prefix needed to keep track if a line has to be printed
-     * @param tree   the tree representation we want to add this subtree " @param preEnumeration the
-     *               enumeration of the parent without the last number
+     * @param tree the tree representation we want to add this subtree " @param preEnumeration the
+     *        enumeration of the parent without the last number
      * @param postNr the last number of the parents enumeration
-     * @param maxNr  the number of nodes at this level
-     * @param ownNr  the place of this node at this level
+     * @param maxNr the number of nodes at this level
+     * @param ownNr the place of this node at this level
      * @return the string representation of this node.
      */
 
     private StringBuffer toString(String prefix, StringBuffer tree, String preEnumeration,
-                                  int postNr, int maxNr, int ownNr) {
+            int postNr, int maxNr, int ownNr) {
         Iterator<Node> childrenIt = childrenIterator();
         // Some constants
         String frontIndent = (maxNr > 1 ? " " : "");
@@ -604,7 +603,7 @@ private StringBuffer toString(String prefix, StringBuffer tree, String preEnumer
         while (childrenIt.hasNext()) {
             childId++;
             childrenIt.next().toString(prefix, tree, newEnumeration, newPostNr, children.size(),
-                    childId);
+                childId);
         }
 
         return tree;
@@ -661,7 +660,7 @@ public String name() {
      * this node.
      *
      * @return true iff the parent of this node has this node as child and this condition holds also
-     * for the own children.
+     *         for the own children.
      */
     public boolean sanityCheckDoubleLinks() {
         if (!root()) {
@@ -788,7 +787,7 @@ public Iterator<Node> iterator() {
      * Retrieves a user-defined data.
      *
      * @param service the class for which the data were registered
-     * @param <T>     any class
+     * @param <T> any class
      * @return null or the previous data
      * @see #register(Object, Class)
      */
@@ -806,7 +805,7 @@ public <T> T lookup(Class<T> service) {
     /**
      * Register a user-defined data in this node info.
      *
-     * @param obj     an object to be registered
+     * @param obj an object to be registered
      * @param service the key under it should be registered
      * @param <T>
      */
@@ -817,9 +816,9 @@ public <T> void register(T obj, Class<T> service) {
     /**
      * Remove a previous registered user-defined data.
      *
-     * @param obj     registered object
+     * @param obj registered object
      * @param service the key under which the data was registered
-     * @param <T>     arbitray object
+     * @param <T> arbitray object
      */
     public <T> void deregister(T obj, Class<T> service) {
         if (userData != null) {
diff --git a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
index 21f2fbc3674..04333491df3 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
@@ -3,28 +3,31 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.speclang.njml;
 
+import java.io.File;
+import java.util.stream.Stream;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.init.ProofInputException;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.util.HelperClassForTests;
+
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.File;
-import java.util.stream.Stream;
-
 public class ContractLoadingTests {
     public static final File EXAMPLES_DIR = new File("../key.ui/examples/");
 
     static Stream<Arguments> files() {
         return Stream.of(
-                new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java")
-        ).map(Arguments::of);
+            new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java"))
+                .map(Arguments::of);
     }
 
     @ParameterizedTest
@@ -33,9 +36,11 @@ void issues1717() throws ProblemLoaderException, ProofInputException {
         File javaFile =
             new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1717/UnderscoreZero.java");
         Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-        var proof = file.startProof(file.getProofContracts().get(0));
+
+        KeYEnvironment<?> env = KeYEnvironment.load(javaFile);
+        Assertions.assertFalse(env.getAvailableContracts().isEmpty());
+        var proof =
+            env.createProof(env.getAvailableContracts().get(0).createProofObl(env.getInitConfig()));
         Assertions.assertNotNull(proof);
     }
 
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
index 85a85b65df1..3d9c18f83f7 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
@@ -1,10 +1,8 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -14,9 +12,15 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using the
+ * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using
+ * the
  * short file name w/o path.
  * <p>
  * Used for displaying files in the examples list w/o prefix
@@ -139,12 +143,12 @@ public String toString() {
 
     public void addToTreeModel(DefaultTreeModel model) {
         DefaultMutableTreeNode node =
-                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
+            findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
         node.add(new DefaultMutableTreeNode(this));
     }
 
     private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
-                                             int from) {
+            int from) {
         if (from == path.length) {
             return root;
         }
@@ -166,7 +170,7 @@ public boolean hasProof() {
     }
 
     private static StringBuilder extractDescription(File file, StringBuilder sb,
-                                                    Properties properties) {
+            Properties properties) {
         try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
             String line;
             boolean emptyLineSeen = false;
@@ -193,4 +197,4 @@ private static StringBuilder extractDescription(File file, StringBuilder sb,
         }
         return sb;
     }
-}
\ No newline at end of file
+}
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
index a80815bbe03..24c539bf86f 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
@@ -3,6 +3,12 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.swing.*;
+
 import de.uka.ilkd.key.control.InteractionListener;
 import de.uka.ilkd.key.core.InterruptListener;
 import de.uka.ilkd.key.core.KeYMediator;
@@ -16,15 +22,10 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
 /**
  * The Class ProofMacroWorker is a swing worker for the application of proof macros.
  * <p>
@@ -40,7 +41,7 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
      * goals under the current pio, selection remains where it was.
      */
     private static final boolean SELECT_GOAL_AFTER_MACRO =
-            Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
+        Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
 
     /**
      * The {@link Node} to start macro at.
@@ -75,13 +76,13 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
     /**
      * Instantiates a new proof macro worker.
      *
-     * @param node     the {@link Node} to start macro at.
-     * @param macro    the macro, not null
+     * @param node the {@link Node} to start macro at.
+     * @param macro the macro, not null
      * @param mediator the mediator, not null
      * @param posInOcc the position, possibly null
      */
     public ProofMacroWorker(Node node, ProofMacro macro, KeYMediator mediator,
-                            PosInOccurrence posInOcc) {
+            PosInOccurrence posInOcc) {
         assert macro != null;
         assert mediator != null;
         this.node = node;
@@ -98,7 +99,7 @@ protected ProofMacroFinishedInfo doInBackground() {
         Proof selectedProof = node.proof();
         info = ProofMacroFinishedInfo.getDefaultInfo(macro, selectedProof);
         ptl.taskStarted(
-                new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
+            new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
         try {
             synchronized (macro) {
                 info = macro.applyTo(mediator.getUI(), node, posInOcc, ptl);
@@ -144,7 +145,7 @@ protected void done() {
     }
 
     protected void emitProofMacroFinished(Node node, ProofMacro macro, PosInOccurrence posInOcc,
-                                          ProofMacroFinishedInfo info) {
+            ProofMacroFinishedInfo info) {
         interactionListeners.forEach((l) -> l.runMacro(node, macro, posInOcc, info));
     }
 
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index 2b8a53215d5..d3bfa1a769e 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -24,16 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.awt.event.ActionEvent;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * This class provides an action for KeY UI which runs a set of specified proof files automatically.
  * The intent of this class is to have a massive test feature for the quality assurance of the KeY
@@ -83,7 +73,7 @@ public class RunAllProofsAction extends MainWindowAction {
     @NonNull
     private List<File> loadFiles() throws IOException {
         LOGGER.info("Use 'export {}=<...>' to set the input file for {}.", ENV_VARIABLE,
-                getClass().getSimpleName());
+            getClass().getSimpleName());
 
         InputStream stream;
         if (RUN_ALL_PROOFS_UI == null) {
@@ -97,7 +87,7 @@ private List<File> loadFiles() throws IOException {
         }
 
         try (BufferedReader in =
-                     new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+            new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             return in.lines().filter(it -> !it.startsWith("#") && !it.trim().isEmpty())
                     .map(it -> (it.startsWith("/") ? new File(it) : new File(exampleDir, it))
                             .getAbsoluteFile())
@@ -120,7 +110,7 @@ public RunAllProofsAction(MainWindow mainWindow) {
 
         setName("Run all proofs");
         setTooltip(
-                "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
+            "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
     }
 
     @Override
@@ -136,7 +126,7 @@ public void actionPerformed(ActionEvent e) {
                 ui.reportStatus(this, "Run: " + absFile);
                 LOGGER.info("Run: {}", absFile);
                 ProblemLoader problemLoader =
-                        ui.getProblemLoader(absFile, null, null, null, getMediator());
+                    ui.getProblemLoader(absFile, null, null, null, getMediator());
                 problemLoader.runSynchronously();
                 LOGGER.info("Loaded: {}", absFile);
 
diff --git a/keyext.api.doc/src/main/java/DocGen.java b/keyext.api.doc/src/main/java/DocGen.java
index 36aed393607..8ab51393898 100644
--- a/keyext.api.doc/src/main/java/DocGen.java
+++ b/keyext.api.doc/src/main/java/DocGen.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -47,9 +50,9 @@ private void printHeader() {
     }
 
     private void endpoints(Metamodel.Endpoint endpoint) {
-        //out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
-        //out.println(getJavaDoc(typeDeclaration));
-        //out.println("\n");
+        // out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        // out.println(getJavaDoc(typeDeclaration));
+        // out.println("\n");
 
         var direction = "";
         if (endpoint instanceof Metamodel.ServerRequest sr)
@@ -91,9 +94,9 @@ private void printType(Metamodel.Type type) {
                     }
                     ```
                     """.formatted(type.name(),
-                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
-                            .collect(Collectors.joining("\n"))));
+                ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                        .collect(Collectors.joining("\n"))));
         }
 
         if (type instanceof Metamodel.EnumType et) {
@@ -101,89 +104,87 @@ private void printType(Metamodel.Type type) {
                     ```
                     enum %s { %s }
                     ```
-                    """.formatted(type.name(), String.join(", ", et.values())
-            ));
+                    """.formatted(type.name(), String.join(", ", et.values())));
             out.format(type.documentation());
         }
         out.format(type.documentation());
         out.println();
     }
 
-        /*
-        private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
-            var annotationExpr = m.getAnnotationByName("JsonNotification").or(
-                            () -> m.getAnnotationByName("JsonRequest"))
-                    .orElseThrow();
-
-            var segment = getJsonSegment(td) + "/";
-            String name = "";
-
-            if (annotationExpr.isMarkerAnnotationExpr()) {
-                name = m.getNameAsString();
-            } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
-                var sma = annotationExpr.asSingleMemberAnnotationExpr();
-                name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
-            } else {
-                var ne = annotationExpr.asNormalAnnotationExpr();
-                for (MemberValuePair pair : ne.getPairs()) {
-                    switch (pair.getName().asString()) {
-                        case "value":
-                            name = pair.getValue().asLiteralStringValueExpr().getValue();
-                            break;
-                        case "useSegment":
-                            if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
-                                segment = "";
-                            }
-                    }
-                }
-            }
-            return segment + name;
-        }
-
-        @Nonnull
-        private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
-            if (typeDeclaration.getJavadoc().isPresent()) {
-                final var javadoc = typeDeclaration.getJavadoc().get();
-                return javadoc.getDescription().toText()
-                        + "\n\n"
-                        + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
-                        .collect(Collectors.joining("\n"));
-            }
-            return "";
-        }
-
-        private static String type (MethodDeclaration method){
-            if (method.getAnnotationByName("JsonNotification").isPresent())
-                return "notification";
-            if (method.getAnnotationByName("JsonRequest").isPresent())
-                return "request";
-            return "";
-        }
-
-        private static boolean isExported (MethodDeclaration method){
-            return method.getAnnotationByName("JsonNotification").isPresent()
-                    || method.getAnnotationByName("JsonRequest").isPresent();
-        }
-
-        private void printHeader () {
-            out.format("# KeY-API%n%n");
-        }
-
-        private void printFooter () {
-        }
-
-
     /*
-    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
-        return it.getAnnotationByName("JsonSegment").isPresent();
-    }
-
-    private static String getJsonSegment(TypeDeclaration<?> it) {
-        var ae = it.getAnnotationByName("JsonSegment").get();
-        return ae.asSingleMemberAnnotationExpr().getMemberValue()
-                .asLiteralStringValueExpr().getValue();
-    }
+     * private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
+     * var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+     * () -> m.getAnnotationByName("JsonRequest"))
+     * .orElseThrow();
+     *
+     * var segment = getJsonSegment(td) + "/";
+     * String name = "";
+     *
+     * if (annotationExpr.isMarkerAnnotationExpr()) {
+     * name = m.getNameAsString();
+     * } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+     * var sma = annotationExpr.asSingleMemberAnnotationExpr();
+     * name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+     * } else {
+     * var ne = annotationExpr.asNormalAnnotationExpr();
+     * for (MemberValuePair pair : ne.getPairs()) {
+     * switch (pair.getName().asString()) {
+     * case "value":
+     * name = pair.getValue().asLiteralStringValueExpr().getValue();
+     * break;
+     * case "useSegment":
+     * if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+     * segment = "";
+     * }
+     * }
+     * }
+     * }
+     * return segment + name;
+     * }
+     *
+     * @Nonnull
+     * private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
+     * if (typeDeclaration.getJavadoc().isPresent()) {
+     * final var javadoc = typeDeclaration.getJavadoc().get();
+     * return javadoc.getDescription().toText()
+     * + "\n\n"
+     * + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+     * .collect(Collectors.joining("\n"));
+     * }
+     * return "";
+     * }
+     *
+     * private static String type (MethodDeclaration method){
+     * if (method.getAnnotationByName("JsonNotification").isPresent())
+     * return "notification";
+     * if (method.getAnnotationByName("JsonRequest").isPresent())
+     * return "request";
+     * return "";
+     * }
+     *
+     * private static boolean isExported (MethodDeclaration method){
+     * return method.getAnnotationByName("JsonNotification").isPresent()
+     * || method.getAnnotationByName("JsonRequest").isPresent();
+     * }
+     *
+     * private void printHeader () {
+     * out.format("# KeY-API%n%n");
+     * }
+     *
+     * private void printFooter () {
+     * }
+     *
+     *
+     * /*
+     * private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+     * return it.getAnnotationByName("JsonSegment").isPresent();
+     * }
+     *
+     * private static String getJsonSegment(TypeDeclaration<?> it) {
+     * var ae = it.getAnnotationByName("JsonSegment").get();
+     * return ae.asSingleMemberAnnotationExpr().getMemberValue()
+     * .asLiteralStringValueExpr().getValue();
+     * }
      */
 
 }
-
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index 1c6c904553e..d053b9268d3 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -1,10 +1,26 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import de.uka.ilkd.key.proof.Proof;
+
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
 import com.google.gson.*;
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
@@ -13,18 +29,6 @@
 import org.keyproject.key.api.remoteclient.ClientApi;
 import sun.misc.Unsafe;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
@@ -51,7 +55,8 @@ public static void main(String[] args) {
         runGenerator("server.py", PythionGenerator.PyApiGen::new);
     }
 
-    private static void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
+    private static void runGenerator(String target,
+            Function<Metamodel.KeyApi, Supplier<String>> api) {
         try {
             var n = api.apply(keyApi);
             Files.writeString(Paths.get(target), n.get());
@@ -65,7 +70,8 @@ private static Gson getGson() {
                 .setPrettyPrinting()
                 .registerTypeAdapter(Type.class, new JsonSerializer<Metamodel.Type>() {
                     @Override
-                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializationContext context) {
+                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc,
+                            JsonSerializationContext context) {
                         JsonObject json = (JsonObject) context.serialize(src);
                         json.addProperty("kind", src.kind());
                         return json;
@@ -76,7 +82,8 @@ public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializati
 
     private static void addServerEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
-        if (jsonSegment == null) return;
+        if (jsonSegment == null)
+            return;
         var segment = jsonSegment.value();
 
         var req = method.getAnnotation(JsonRequest.class);
@@ -131,27 +138,41 @@ private static Metamodel.Type getOrFindType(Class<?> type) {
             return getOrFindType(type.getTypeParameters()[0].getClass());
         }
 
-        if (type == Unsafe.class || type == Class.class || type == Constructor.class || type == Proof.class) {
+        if (type == Unsafe.class || type == Class.class || type == Constructor.class
+                || type == Proof.class) {
             throw new IllegalStateException("Forbidden class reached!");
         }
 
-        if (type == String.class) return Metamodel.BuiltinType.STRING;
-        if (type == Integer.class) return Metamodel.BuiltinType.INT;
-        if (type == Double.class) return Metamodel.BuiltinType.DOUBLE;
-        if (type == Long.class) return Metamodel.BuiltinType.LONG;
-        if (type == Character.class) return Metamodel.BuiltinType.LONG;
-        if (type == File.class) return Metamodel.BuiltinType.STRING;
-        if (type == Boolean.class) return Metamodel.BuiltinType.BOOL;
-        if (type == Boolean.TYPE) return Metamodel.BuiltinType.BOOL;
-
-        if (type == Integer.TYPE) return Metamodel.BuiltinType.INT;
-        if (type == Double.TYPE) return Metamodel.BuiltinType.DOUBLE;
-        if (type == Long.TYPE) return Metamodel.BuiltinType.LONG;
-        if (type == Character.TYPE) return Metamodel.BuiltinType.LONG;
+        if (type == String.class)
+            return Metamodel.BuiltinType.STRING;
+        if (type == Integer.class)
+            return Metamodel.BuiltinType.INT;
+        if (type == Double.class)
+            return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.class)
+            return Metamodel.BuiltinType.LONG;
+        if (type == Character.class)
+            return Metamodel.BuiltinType.LONG;
+        if (type == File.class)
+            return Metamodel.BuiltinType.STRING;
+        if (type == Boolean.class)
+            return Metamodel.BuiltinType.BOOL;
+        if (type == Boolean.TYPE)
+            return Metamodel.BuiltinType.BOOL;
+
+        if (type == Integer.TYPE)
+            return Metamodel.BuiltinType.INT;
+        if (type == Double.TYPE)
+            return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.TYPE)
+            return Metamodel.BuiltinType.LONG;
+        if (type == Character.TYPE)
+            return Metamodel.BuiltinType.LONG;
 
         System.out.println(type);
         var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
-        if (t.isPresent()) return t.get();
+        if (t.isPresent())
+            return t.get();
         var a = createType(type);
         types.add(a);
         return a;
@@ -161,8 +182,8 @@ private static Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum())
             return new Metamodel.EnumType(type.getSimpleName(),
-                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
-                    documentation);
+                Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                documentation);
 
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
@@ -186,7 +207,8 @@ private static String findDocumentation(Class<?> type) {
                 e.printStackTrace();
                 return "";
             }
-        } else return "";
+        } else
+            return "";
     }
 
     private static Path findFileForType(Class<?> type) {
@@ -226,7 +248,8 @@ private static void addClientEndpoint(Method method) {
         }
     }
 
-    private static String callMethodName(String method, String segment, String userValue, boolean useSegment) {
+    private static String callMethodName(String method, String segment, String userValue,
+            boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -243,9 +266,11 @@ private static String callMethodName(String method, String segment, String userV
     }
 
     private static Metamodel.Type getOrFindType(Type genericReturnType) {
-        if (genericReturnType instanceof Class c) return getOrFindType(c);
+        if (genericReturnType instanceof Class c)
+            return getOrFindType(c);
         if (genericReturnType instanceof ParameterizedType pt) {
-            if (Objects.equals(pt.getRawType().getTypeName(), CompletableFuture.class.getTypeName())) {
+            if (Objects.equals(pt.getRawType().getTypeName(),
+                CompletableFuture.class.getTypeName())) {
                 return getOrFindType(pt.getActualTypeArguments()[0]);
             }
             if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index 1a868f49a06..62146f0f5ee 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -1,7 +1,10 @@
-import org.jspecify.annotations.NullMarked;
-
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.util.List;
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
@@ -10,11 +13,12 @@
 public class Metamodel {
     public record KeyApi(
             List<Endpoint> endpoints,
-            List<Type> types
-    ) {
+            List<Type> types) {
     }
 
-    sealed interface Endpoint {
+    sealed
+
+    interface Endpoint {
         String name();
 
         String documentation();
@@ -42,55 +46,67 @@ record ClientNotification(String name, String documentation, List<Argument> args
     }
 
     record Field(String name, /*Type*/ String type, String documentation) {
-        Field(String name, String type) {
+
+    Field(String name, String type) {
             this(name, type, "");
         }
-    }
+}
 
-    public sealed interface Type {
-        default String kind() {
+public sealed
+
+
+interface Type {
+    default String kind() {
             return getClass().getSimpleName();
         }
 
-        String documentation();
+    String documentation();
 
-        String name();
-    }
+    String name();
+}
 
-    enum BuiltinType implements Type {
-        INT, LONG, STRING, BOOL, DOUBLE;
 
-        @Override
-        public String documentation() {
-            return "built-in data type";
-        }
+enum BuiltinType implements Type {
+    INT, LONG, STRING, BOOL, DOUBLE;
+
+    @Override
+    public String documentation() {
+        return "built-in data type";
+    }
+
     }
 
     record ListType(Type type, String documentation) implements Type {
-        @Override
-        public String name() {
-            return type().name() + "[]";
-        }
+
+    @Override
+    public String name() {
+        return type().name() + "[]";
+    }
+
     }
 
     record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
-        @Override
-        public String name() {
-            return typeName;
-        }
+
+    @Override
+    public String name() {
+        return typeName;
+    }
+
     }
 
     public record EitherType(Type a, Type b, String documentation) implements Type {
-        @Override
-        public String name() {
-            return "either<a,b>";
-        }
+
+    @Override
+    public String name() {
+        return "either<a,b>";
+    }
+
     }
 
     public record EnumType(String typeName, List<String> values, String documentation) implements Type {
-        @Override
-        public String name() {
-            return typeName;
-        }
+
+    @Override
+    public String name() {
+        return typeName;
     }
-}
+}}
diff --git a/keyext.api.doc/src/main/java/PythionGenerator.java b/keyext.api.doc/src/main/java/PythionGenerator.java
index a4d2018c328..9fc222a1221 100644
--- a/keyext.api.doc/src/main/java/PythionGenerator.java
+++ b/keyext.api.doc/src/main/java/PythionGenerator.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -54,11 +57,11 @@ protected String asPython(Metamodel.Type t) {
 
         if (t instanceof Metamodel.BuiltinType bt) {
             return switch (bt) {
-                case INT -> "int";
-                case LONG -> "int";
-                case STRING -> "str";
-                case BOOL -> "bool";
-                case DOUBLE -> "float";
+            case INT -> "int";
+            case LONG -> "int";
+            case STRING -> "str";
+            case BOOL -> "bool";
+            case DOUBLE -> "float";
             };
         }
         return t.name();
@@ -85,19 +88,21 @@ protected void run() {
                     import enum
                     import abc
                     import typing
-                    from abc import abstractmethod                    
+                    from abc import abstractmethod
                     """);
             server(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+                metamodel.endpoints()
+                        .stream()
+                        .filter(it -> it instanceof Metamodel.ServerRequest
+                                || it instanceof Metamodel.ServerNotification)
+                        .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
 
             client(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+                metamodel.endpoints()
+                        .stream()
+                        .filter(it -> it instanceof Metamodel.ClientRequest
+                                || it instanceof Metamodel.ClientNotification)
+                        .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
         }
 
 
@@ -113,7 +118,7 @@ private void clientEndpoint(Metamodel.Endpoint endpoint) {
             out.format("    @abstractmethod%n");
             if (endpoint instanceof Metamodel.ClientRequest sr) {
                 out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                        asPython(sr.returnType()));
+                    asPython(sr.returnType()));
             } else {
                 out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
             }
@@ -128,7 +133,7 @@ private void server(Stream<Metamodel.Endpoint> sorted) {
                     class KeyServer(ServerBase):%n
                         def __init__(self, endpoint : LspEndpoint):
                             super().__init__(endpoint)
-                              
+
                      """);
             sorted.forEach(this::serverEndpoint);
         }
@@ -147,13 +152,15 @@ private void serverEndpoint(Metamodel.Endpoint endpoint) {
 
             if (endpoint instanceof Metamodel.ServerRequest sr) {
                 out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                        asPython(sr.returnType()));
+                    asPython(sr.returnType()));
                 out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
-                out.format("       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
+                out.format(
+                    "       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
             } else {
                 out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
                 out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(), params));
+                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(),
+                    params));
             }
             out.println();
             out.println();
@@ -183,12 +190,13 @@ protected void run() {
                     import abc
                     import typing
                     from abc import abstractmethod, ABCMeta
-                                                          
+
                     """);
             metamodel.types().forEach(this::printType);
 
-            var names = metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
-                    .collect(Collectors.joining(","));
+            var names =
+                metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
+                        .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
         }
 
@@ -200,10 +208,9 @@ private void printType(Metamodel.Type type) {
                         .formatted(it.name(), asPython(it.type()), it.documentation())));
 
                 out.format("\n    def __init__(self%s):%n".formatted(
-                        ot.fields().stream()
-                                .map(Metamodel.Field::name)
-                                .collect(Collectors.joining(", ", ", ", ""))
-                ));
+                    ot.fields().stream()
+                            .map(Metamodel.Field::name)
+                            .collect(Collectors.joining(", ", ", ", ""))));
 
                 if (ot.fields().isEmpty())
                     out.format("        pass%n%n");
@@ -220,4 +227,4 @@ private void printType(Metamodel.Type type) {
             out.println();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
index b8f61b62272..9082242ee37 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -1,13 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
-import com.google.gson.*;
-
 import java.lang.reflect.Type;
 
+import com.google.gson.*;
+
 /**
- * <a href="https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow post</a>
+ * <a href=
+ * "https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow
+ * post</a>
  */
-public class GenericSerializer implements JsonSerializer<Object> /*, JsonDeserializer<Object>*/ {
+public class GenericSerializer implements JsonSerializer<Object> /* , JsonDeserializer<Object> */ {
 
     private static final String CLASS_PROPERTY_NAME = "$type";
     private final Gson gson;
@@ -21,31 +26,31 @@ public GenericSerializer(Gson gson) {
     }
 
     /*
-    @Override
-    public Object deserialize(JsonElement json, Type typeOfT,
-                              JsonDeserializationContext context) throws JsonParseException {
-
-        Class<?> actualClass;
-        if (json.isJsonObject()) {
-            JsonObject jsonObject = json.getAsJsonObject();
-            String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
-            try {
-                actualClass = Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-                throw new JsonParseException(e.getMessage());
-            }
-        } else {
-            actualClass = typeOfT.getClass();
-        }
-
-        return gson.fromJson(json, actualClass);
-    }
+     * @Override
+     * public Object deserialize(JsonElement json, Type typeOfT,
+     * JsonDeserializationContext context) throws JsonParseException {
+     *
+     * Class<?> actualClass;
+     * if (json.isJsonObject()) {
+     * JsonObject jsonObject = json.getAsJsonObject();
+     * String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
+     * try {
+     * actualClass = Class.forName(className);
+     * } catch (ClassNotFoundException e) {
+     * e.printStackTrace();
+     * throw new JsonParseException(e.getMessage());
+     * }
+     * } else {
+     * actualClass = typeOfT.getClass();
+     * }
+     *
+     * return gson.fromJson(json, actualClass);
+     * }
      */
 
     @Override
     public JsonElement serialize(Object src, Type typeOfSrc,
-                                 JsonSerializationContext context) {
+            JsonSerializationContext context) {
         JsonElement retValue = gson.toJsonTree(src);
         if (retValue.isJsonObject()) {
             retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getName());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index f2a28731d3a..1e3a0539711 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -1,5 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
 import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
@@ -23,11 +36,13 @@
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.util.KeYConstants;
+
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSet;
+
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.key_project.util.collection.ImmutableList;
-import org.key_project.util.collection.ImmutableSet;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.internal.NodeText;
@@ -36,16 +51,6 @@
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
-
 public final class KeyApiImpl implements KeyApi {
     private final KeyIdentifications data = new KeyIdentifications();
 
@@ -74,8 +79,8 @@ public KeyApiImpl() {
     @Override
     @JsonRequest
     public CompletableFuture<List<ExampleDesc>> examples() {
-        return CompletableFutures.computeAsync((c) ->
-                ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+        return CompletableFutures
+                .computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples())
                         .stream().map(ExampleDesc::from).toList());
     }
 
@@ -101,19 +106,20 @@ public CompletableFuture<String> getVersion() {
     @Override
     public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                ProofMacroFacade.instance().getMacros().stream()
-                        .map(ProofMacroDesc::from).toList()
-        );
+            ProofMacroFacade.instance().getMacros().stream()
+                    .map(ProofMacroDesc::from).toList());
     }
 
     @Override
     public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                ProofScriptCommandFacade.instance().getScriptCommands().stream().map(ProofScriptCommandDesc::from).toList());
+            ProofScriptCommandFacade.instance().getScriptCommands().stream()
+                    .map(ProofScriptCommandDesc::from).toList());
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine, StreategyOptions options) {
+    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine,
+            StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
@@ -129,14 +135,16 @@ public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLi
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId, StreategyOptions options) {
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId,
+            StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
             var macro = Objects.requireNonNull(ProofMacroFacade.instance().getMacro(macroId));
 
             try {
-                var info = macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
+                var info =
+                    macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
                 return MacroStatistic.from(proofId, info);
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -152,8 +160,8 @@ public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions
             var env = data.find(proofId.env());
             try {
                 env.getProofControl().startAndWaitForAutoMode(proof);
-                //clientListener);
-                return null;//MacroStatistic.from(proofId, info);
+                // clientListener);
+                return null;// MacroStatistic.from(proofId, info);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -172,7 +180,8 @@ public CompletableFuture<Boolean> dispose(ProofId id) {
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened, boolean onlyEnabled) {
+    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened,
+            boolean onlyEnabled) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             if (onlyOpened && !onlyEnabled) {
@@ -195,7 +204,7 @@ private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
 
     private NodeDesc asNodeDesc(ProofId proofId, Node it) {
         return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(),
-                it.getNodeInfo().getScriptRuleApplication());
+            it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
@@ -207,12 +216,12 @@ public CompletableFuture<NodeDesc> tree(ProofId proofId) {
     }
 
     private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
-        final List<NodeDesc> list = root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
+        final List<NodeDesc> list =
+            root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
-                root.getNodeInfo().getBranchLabel(),
-                root.getNodeInfo().getScriptRuleApplication(),
-                list
-        );
+            root.getNodeInfo().getBranchLabel(),
+            root.getNodeInfo().getScriptRuleApplication(),
+            list);
     }
 
     @Override
@@ -282,7 +291,8 @@ public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(envId);
             var contracts = env.getAvailableContracts();
-            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it)).toList();
+            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it))
+                    .toList();
         });
     }
 
@@ -291,7 +301,8 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(contractId.envId());
             var contracts = env.getAvailableContracts();
-            var contract = contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
+            var contract =
+                contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
             if (contract.isPresent()) {
                 try {
                     var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
@@ -311,7 +322,8 @@ public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options
             var node = data.find(nodeId);
             var env = data.find(nodeId.proofId().env());
             var notInfo = new NotationInfo();
-            final var layouter = new PosTableLayouter(options.width(), options.indentation(), options.pure());
+            final var layouter =
+                new PosTableLayouter(options.width(), options.indentation(), options.pure());
             var lp = new LogicPrinter(notInfo, env.getServices(), layouter);
             lp.printSequent(node.sequent());
 
@@ -332,8 +344,9 @@ public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int p
             var goal = proof.getOpenGoal(node);
             var nodeText = data.find(printId);
             var pis = nodeText.table().getPosInSequent(pos, filter);
-            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis, goal)
-                    .getActions();
+            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis,
+                goal)
+                        .getActions();
         });
 
     }
@@ -365,19 +378,21 @@ public CompletableFuture<ProofId> loadExample(String id) {
                 KeYEnvironment<?> env = null;
                 try {
                     var loader = control.load(JavaProfile.getDefaultProfile(),
-                            ex.getObligationFile(), null, null, null, null, true, null);
+                        ex.getObligationFile(), null, null, null, null, true, null);
                     InitConfig initConfig = loader.getInitConfig();
 
                     env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                            loader.getProofScript(), loader.getResult());
+                        loader.getProofScript(), loader.getResult());
                     var envId = new EnvironmentId(env.toString());
                     data.register(envId, env);
                     proof = Objects.requireNonNull(env.getLoadedProof());
                     var proofId = new ProofId(envId, proof.name().toString());
                     return data.register(proofId, proof);
                 } catch (ProblemLoaderException e) {
-                    if (proof != null) proof.dispose();
-                    if (env != null) env.dispose();
+                    if (proof != null)
+                        proof.dispose();
+                    if (env != null)
+                        env.dispose();
                     throw new RuntimeException(e);
                 }
             }
@@ -390,17 +405,19 @@ public CompletableFuture<ProofId> loadProblem(ProblemDefinition problem) {
         return CompletableFutures.computeAsync((c) -> {
             Proof proof = null;
             KeYEnvironment<?> env = null;
-              /*  var loader = control.load(JavaProfile.getDefaultProfile(),
-                        ex.getObligationFile(), null, null, null, null, true, null);
-                InitConfig initConfig = loader.getInitConfig();
-
-                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
-                var envId = new EnvironmentId(env.toString());
-                data.register(envId, env);
-                proof = Objects.requireNonNull(env.getLoadedProof());
-                var proofId = new ProofId(envId, proof.name().toString());
-                return data.register(proofId, proof);*/
+            /*
+             * var loader = control.load(JavaProfile.getDefaultProfile(),
+             * ex.getObligationFile(), null, null, null, null, true, null);
+             * InitConfig initConfig = loader.getInitConfig();
+             *
+             * env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+             * loader.getProofScript(), loader.getResult());
+             * var envId = new EnvironmentId(env.toString());
+             * data.register(envId, env);
+             * proof = Objects.requireNonNull(env.getLoadedProof());
+             * var proofId = new ProofId(envId, proof.name().toString());
+             * return data.register(proofId, proof);
+             */
             return null;
         });
 
@@ -415,18 +432,20 @@ public CompletableFuture<ProofId> loadKey(String content) {
                 final var tempFile = File.createTempFile("json-rpc-", ".key");
                 Files.writeString(tempFile.toPath(), content);
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                        tempFile, null, null, null, null, true, null);
+                    tempFile, null, null, null, null, true, null);
                 InitConfig initConfig = loader.getInitConfig();
                 env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
+                    loader.getProofScript(), loader.getResult());
                 var envId = new EnvironmentId(env.toString());
                 data.register(envId, env);
                 proof = Objects.requireNonNull(env.getLoadedProof());
                 var proofId = new ProofId(envId, proof.name().toString());
                 return data.register(proofId, proof);
             } catch (ProblemLoaderException | IOException e) {
-                if (proof != null) proof.dispose();
-                if (env != null) env.dispose();
+                if (proof != null)
+                    proof.dispose();
+                if (env != null)
+                    env.dispose();
                 throw new RuntimeException(e);
             }
         });
@@ -444,16 +463,16 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
             KeYEnvironment<?> env = null;
             try {
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                        params.keyFile(),
-                        params.classPath(),
-                        params.bootClassPath(),
-                        params.includes(),
-                        null,
-                        true,
-                        null);
+                    params.keyFile(),
+                    params.classPath(),
+                    params.bootClassPath(),
+                    params.includes(),
+                    null,
+                    true,
+                    null);
                 InitConfig initConfig = loader.getInitConfig();
                 env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
+                    loader.getProofScript(), loader.getResult());
                 var envId = new EnvironmentId(env.toString());
                 data.register(envId, env);
                 if ((proof = env.getLoadedProof()) != null) {
@@ -463,8 +482,10 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
                     return Either.forLeft(envId);
                 }
             } catch (ProblemLoaderException e) {
-                if (proof != null) proof.dispose();
-                if (env != null) env.dispose();
+                if (proof != null)
+                    proof.dispose();
+                if (env != null)
+                    env.dispose();
                 throw new RuntimeException(e);
             }
         });
@@ -502,7 +523,9 @@ public void loadingStarted(AbstractProblemLoader loader) {
         }
 
         @Override
-        public void loadingFinished(AbstractProblemLoader loader, IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList, AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
+        public void loadingFinished(AbstractProblemLoader loader,
+                IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList,
+                AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
             super.loadingFinished(loader, poContainer, proofList, result);
         }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
index f28001e8c15..2f948413e72 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -1,4 +1,4 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
-
-import org.keyproject.key.api.data.KeyIdentifications.NodeId;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index b0491145cda..53293b35680 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -1,6 +1,16 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
 
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nullable;
+
 import com.google.gson.GsonBuilder;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
@@ -11,13 +21,6 @@
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
 
-import javax.annotation.Nullable;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutionException;
-
 /**
  * @author Alexander Weigl
  * @version 1 (07.10.23)
@@ -26,7 +29,7 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
-    //region CLI arguments
+    // region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
     @Option(names = "--trace", description = "use stdout and stdin for communication")
@@ -41,19 +44,21 @@ public class StartServer implements Runnable {
     Integer clientPort;
 
 
-    @Option(names = "--infile", paramLabel = "FILE or PIPE", description = "read from named pipe or file")
+    @Option(names = "--infile", paramLabel = "FILE or PIPE",
+        description = "read from named pipe or file")
     @Nullable
     File inFile;
 
-    @Option(names = "--outfile", paramLabel = "FILE or PIPE", description = "write to named pipe or file")
+    @Option(names = "--outfile", paramLabel = "FILE or PIPE",
+        description = "write to named pipe or file")
     File outFile;
 
-    @Option(names = {"-h", "--help"}, usageHelp = true, description = "display a help message")
+    @Option(names = { "-h", "--help" }, usageHelp = true, description = "display a help message")
     boolean helpRequested = false;
 
     @Option(names = "--websocket")
     boolean websocket = false;
-    //endregion
+    // endregion
 
     public static void main(String[] args) {
         new CommandLine(new StartServer()).execute(args);
@@ -159,12 +164,11 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
-        //if (localServices != null && !localServices.isEmpty())
+        // if (localServices != null && !localServices.isEmpty())
         launcherBuilder.setLocalService(keyApi);
-        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        // if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
         return launcherBuilder.create();
     }
 }
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 31714a361d7..c65a93d677a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -1,5 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.control.ProofControl;
 import de.uka.ilkd.key.logic.Name;
@@ -9,56 +16,53 @@
 import de.uka.ilkd.key.pp.PosInSequent;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
-import org.jspecify.annotations.NonNull;
+
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
+
+import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
 import org.keyproject.key.api.data.TermActionDesc;
 import org.keyproject.key.api.data.TermActionKind;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
 public class TermActionUtil {
     private static final Set<Name> CLUTTER_RULESETS =
-            Set.of(new Name("notHumanReadable"),
-                    new Name("obsolete"),
-                    new Name("pullOutQuantifierAll"),
-                    new Name("pullOutQuantifierEx"));
+        Set.of(new Name("notHumanReadable"),
+            new Name("obsolete"),
+            new Name("pullOutQuantifierAll"),
+            new Name("pullOutQuantifierEx"));
     private static final Set<Name> CLUTTER_RULES = Set.of(
-            new Name("cut_direct_r"),
-            new Name("cut_direct_l"),
-            new Name("case_distinction_r"),
-            new Name("case_distinction_l"),
-            new Name("local_cut"),
-            new Name("commute_and_2"),
-            new Name("commute_or_2"),
-            new Name("boxToDiamond"),
-            new Name("pullOut"),
-            new Name("typeStatic"),
-            new Name("less_is_total"),
-            new Name("less_zero_is_total"),
-            new Name("applyEqReverse"),
+        new Name("cut_direct_r"),
+        new Name("cut_direct_l"),
+        new Name("case_distinction_r"),
+        new Name("case_distinction_l"),
+        new Name("local_cut"),
+        new Name("commute_and_2"),
+        new Name("commute_or_2"),
+        new Name("boxToDiamond"),
+        new Name("pullOut"),
+        new Name("typeStatic"),
+        new Name("less_is_total"),
+        new Name("less_zero_is_total"),
+        new Name("applyEqReverse"),
 
-            // the following are used for drag'n'drop interactions
-            new Name("eqTermCut"),
-            new Name("instAll"),
-            new Name("instEx")
-    );
+        // the following are used for drag'n'drop interactions
+        new Name("eqTermCut"),
+        new Name("instAll"),
+        new Name("instEx"));
     private static final Set<String> FILTER_SCRIPT_COMMANDS = Set.of(
-            "exit",
-            "leave",
-            "javascript",
-            "skip",
-            "macro",
-            "rule",
-            "script");
+        "exit",
+        "leave",
+        "javascript",
+        "skip",
+        "macro",
+        "rule",
+        "script");
 
     private final PosInSequent pos;
     private final Goal goal;
@@ -67,7 +71,8 @@ public class TermActionUtil {
     private final List<TermActionDesc> actions = new ArrayList<>(1024);
     private final NodeTextId nodeTextId;
 
-    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env, @NonNull PosInSequent pos, @NonNull Goal goal) {
+    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env,
+            @NonNull PosInSequent pos, @NonNull Goal goal) {
         this.pos = pos;
         this.goal = goal;
         this.nodeTextId = nodeTextId;
@@ -75,8 +80,10 @@ public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?>
         ProofControl c = env.getUi().getProofControl();
         final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
         for (ProofMacro macro : ProofMacroFacade.instance().getMacros()) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "macro:" + macro.getScriptCommandName());
-            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(), macro.getCategory(), TermActionKind.Macro);
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "macro:" + macro.getScriptCommandName());
+            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(),
+                macro.getCategory(), TermActionKind.Macro);
             add(ta);
         }
         ImmutableList<TacletApp> findTaclet = c.getFindTaclet(goal, occ);
@@ -86,16 +93,18 @@ public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?>
 
 
         for (TacletApp tacletApp : find) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "find:" + tacletApp.rule());
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "find:" + tacletApp.rule());
             TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
-                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+                tacletApp.rule().toString(), "", TermActionKind.Taclet);
             add(ta);
         }
 
         for (TacletApp tacletApp : nofind) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "nofind:" + tacletApp.rule());
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "nofind:" + tacletApp.rule());
             TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
-                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+                tacletApp.rule().toString(), "", TermActionKind.Taclet);
             add(ta);
         }
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 67871cec674..53cd4cec09c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -1,49 +1,54 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.adapters;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.macros.ProofMacro;
 import org.keyproject.key.api.data.MacroDescription;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Type;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
 public class KeyAdapter {
-    //private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
-    //private final TypeAdapter<Object> adaptor;
+    // private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    // private final TypeAdapter<Object> adaptor;
 
     public KeyAdapter(GsonBuilder gson) {
         gson.registerTypeAdapter(File.class, new FileTypeAdapter());
-        //gson.registerTypeAdapter(Function.class, new FunctionSerializer());
-        //gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
+        // gson.registerTypeAdapter(Function.class, new FunctionSerializer());
+        // gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
     }
 
 
     /*
-    //translating entities to identification strings
-    public void insert(Identifiable p) {
-        var id = p.identification();
-        if (!map.containsKey(id)) {
-            map.put(id, new WeakReference<>(p));
-        }
-    }
-
-    public Object find(String id) {
-        return map.get(id).get();
-    }
-    //endregion
-    */
+     * //translating entities to identification strings
+     * public void insert(Identifiable p) {
+     * var id = p.identification();
+     * if (!map.containsKey(id)) {
+     * map.put(id, new WeakReference<>(p));
+     * }
+     * }
+     *
+     * public Object find(String id) {
+     * return map.get(id).get();
+     * }
+     * //endregion
+     */
 
     static class MacroSerializer implements JsonSerializer<ProofMacro> {
         @Override
-        public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(ProofMacro src, Type typeOfSrc,
+                JsonSerializationContext context) {
             return context.serialize(MacroDescription.from(src));
         }
     }
@@ -62,7 +67,8 @@ public File read(JsonReader in) throws IOException {
 
     static class FunctionSerializer implements JsonSerializer<Function> {
         @Override
-        public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(Function src, Type typeOfSrc,
+                JsonSerializationContext context) {
             var obj = new JsonObject();
             obj.add("name", context.serialize(src.name().toString()));
             obj.add("skolemConstant", context.serialize(src.isSkolemConstant()));
@@ -76,7 +82,8 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
 
     public static class ThrowableAdapter implements JsonSerializer<Throwable> {
         @Override
-        public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(Throwable src, Type typeOfSrc,
+                JsonSerializationContext context) {
             var obj = new JsonObject();
             obj.add("$class", context.serialize(src.getClass().getSimpleName()));
             obj.add("message", context.serialize(src.getMessage()));
@@ -85,16 +92,22 @@ public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationCon
         }
     }
 
-    /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
-        @Override
-        public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return (Identifiable) find(json.getAsString());
-        }
-
-        @Override
-        public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext context) {
-            insert(src);
-            return context.serialize(src.identification());
-        }
-    }*/
+    /*
+     * class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>,
+     * JsonDeserializer<Identifiable> {
+     *
+     * @Override
+     * public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext
+     * context) throws JsonParseException {
+     * return (Identifiable) find(json.getAsString());
+     * }
+     *
+     * @Override
+     * public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext
+     * context) {
+     * insert(src);
+     * return context.serialize(src.identification());
+     * }
+     * }
+     */
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
index bbc28eec1ec..522f32d9b3b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
@@ -4,4 +4,4 @@
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
-package org.keyproject.key.api.adapters;
\ No newline at end of file
+package org.keyproject.key.api.adapters;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index 531bc2fb56d..b6a363a6f6e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.java.Services;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 1868871c0e3..3b7238f676e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import de.uka.ilkd.key.logic.op.Function;
-
 import java.util.List;
 
+import de.uka.ilkd.key.logic.op.Function;
+
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 6d66823142a..3f512c76fbd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -1,16 +1,20 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.internal.NodeText;
 
-import java.lang.ref.WeakReference;
-import java.util.Objects;
-
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
@@ -19,27 +23,31 @@ public class KeyIdentifications {
     private final BiMap<EnvironmentId, KeyEnvironmentContainer> mapEnv = HashBiMap.create(16);
 
     public KeyEnvironmentContainer getContainer(EnvironmentId environmentId) {
-        return Objects.requireNonNull(mapEnv.get(environmentId), "Could not find environment for id" + environmentId);
+        return Objects.requireNonNull(mapEnv.get(environmentId),
+            "Could not find environment for id" + environmentId);
     }
 
     public ProofContainer getContainer(ProofId proofId) {
         return Objects.requireNonNull(getContainer(proofId.env()).mapProof.get(proofId),
-                "Could not find proof for id" + proofId);
+            "Could not find proof for id" + proofId);
     }
 
     public KeYEnvironment<?> find(EnvironmentId envid) {
-        return Objects.requireNonNull(getContainer(envid).env.get(), "Environment was removed by gc");
+        return Objects.requireNonNull(getContainer(envid).env.get(),
+            "Environment was removed by gc");
     }
 
     @NonNull
     public Proof find(ProofId proofId) {
-        return Objects.requireNonNull(getContainer(proofId).wProof.get(), "Could not find a proof for id " + proofId);
+        return Objects.requireNonNull(getContainer(proofId).wProof.get(),
+            "Could not find a proof for id " + proofId);
     }
 
     @NonNull
     public NodeText find(NodeTextId nodeTextId) {
-        return Objects.requireNonNull(getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
-                "Could not find a print-out with the id " + nodeTextId);
+        return Objects.requireNonNull(
+            getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
+            "Could not find a print-out with the id " + nodeTextId);
     }
 
     public void dispose(NodeTextId nodeTextId) {
@@ -54,7 +62,8 @@ public void dispose(ProofId id) {
     }
 
     public Node find(NodeId nodeId) {
-        @NonNull Proof p = find(nodeId.proofId);
+        @NonNull
+        Proof p = find(nodeId.proofId);
         var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
         return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 85ec900cd57..6d0a47c9a3f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import java.io.File;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index 0274bc38b30..fc2a8ba0e95 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index b0c2397d1f3..6825f99a90c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -6,10 +9,9 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, boolean cancelled, int appliedRules,
+public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, int appliedRules,
                              int closedGoals) {
     public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
-        return new MacroStatistic(proofId, info.getMacro().getName(), info.isCancelled(),
-                info.getAppliedRules(), info.getClosedGoals());
+        return new MacroStatistic(proofId, info.getMacro().getName(), info.getAppliedRules(), info.getClosedGoals());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index eda5e693f64..cd306e53816 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
index 333b24f1c73..df4eb11f82f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
index 640c25371d6..dbb0e899496 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index d952ea3a654..be69d976fc7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -1,10 +1,13 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
index 31981c61beb..f1faea9cf12 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index f6eef733d08..0f086d8f936 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index 66df02ee6b0..797f8ccb16f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import de.uka.ilkd.key.logic.sort.Sort;
-
 import java.util.List;
 
+import de.uka.ilkd.key.logic.sort.Sort;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
index b73ee35b7b5..ea804f0562b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
index b27ac08a279..d9c619f4dea 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
index cc7d9aec71a..0a371aa48e4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index 7f8c9564aa9..99a258f79d4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 public enum TraceValue {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index 213bb6b9dbe..7f8509df70c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
index 5750fea944d..84898829e9a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
@@ -1,8 +1,9 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.internal;
 
 import de.uka.ilkd.key.pp.InitialPositionTable;
-import de.uka.ilkd.key.pp.PositionTable;
-import de.uka.ilkd.key.proof.Node;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index e84a0152760..dc8fb6362c6 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -1,5 +1,11 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.ContractDesc;
@@ -7,9 +13,6 @@
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.SortDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index 6c52dfd39aa..5f19f881e9d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -1,12 +1,14 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.gui.Example;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
 @JsonSegment("examples")
 public interface ExampleApi {
     @JsonRequest("list")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
index c0091943899..e2f00758a72 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.gui.Example;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index 959ed91570c..68a9e263708 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.NodeTextDesc;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.data.NodeTextDesc;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 56a166f9af7..a94b35967af 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,7 +1,11 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 /**
  * The combined interface that is provided by KeY.
  */
-public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi, ProofLoadApi{
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi,
+        GoalApi, EnvApi, ProofLoadApi {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index f101a47f16a..ea2c8174a58 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.ProofMacroDesc;
 import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import org.keyproject.key.api.data.KeyIdentifications.*;
-
 @JsonSegment("meta")
 public interface MetaApi {
     @JsonRequest("version")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
index 6555b2a16fb..4144c9e6877 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index e496b7a4d38..8d0fc27154d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -1,25 +1,31 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import de.uka.ilkd.key.proof.Statistics;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
 import org.keyproject.key.api.data.StreategyOptions;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 public interface ProofApi {
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine, StreategyOptions options);
+    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
+            StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId, StreategyOptions options);
+    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId,
+            StreategyOptions options);
 
     @JsonRequest
     CompletableFuture<MacroStatistic> auto(ProofId proof, StreategyOptions options);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 9ffedadf57d..2b5f5e78187 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -1,19 +1,20 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.Proof;
+import java.util.concurrent.CompletableFuture;
+
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.EnvironmentId;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
 import org.keyproject.key.api.data.LoadParams;
 import org.keyproject.key.api.data.ProblemDefinition;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * Functionalities for loading proofs either from a built-in example, or from a set of files.
  *
@@ -24,6 +25,7 @@
 public interface ProofLoadApi {
     /**
      * I am not sure whether this is helpful. Mainly a feature for testing?!
+     *
      * @param id
      * @return
      */
@@ -53,5 +55,6 @@ public interface ProofLoadApi {
      * @throws ProblemLoaderException if something went wrong
      */
     @JsonRequest
-    CompletableFuture<Either<EnvironmentId,ProofId>> load(LoadParams params) throws ProblemLoaderException;
-}
\ No newline at end of file
+    CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
+            throws ProblemLoaderException;
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index d3225919d63..cd4aa88b146 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
 import org.keyproject.key.api.data.KeyIdentifications.TreeNodeId;
 import org.keyproject.key.api.data.TreeNodeDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index 00e85b9e021..bcbff9a04ff 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -1,12 +1,15 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.TraceValue;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
@@ -15,9 +18,15 @@
 public interface ServerManagement {
     /**
      * Shutdown Request (:leftwards_arrow_with_hook:)
-     * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+     * The shutdown request is sent from the client to the server. It asks the server to shut down,
+     * but to not exit (otherwise the response might not be delivered correctly to the client).
+     * There is a separate exit notification that asks the server to exit. Clients must not send any
+     * notifications other than exit or requests to a server to which they have sent a shutdown
+     * request. Clients should also wait with sending the exit notification until they have received
+     * a response from the shutdown request.
      * <p>
-     * If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+     * If a server receives requests after a shutdown request those requests should error with
+     * InvalidRequest.
      * <p>
      * Request:
      * <p>
@@ -33,7 +42,8 @@ public interface ServerManagement {
 
     /**
      * Exit Notification (:arrow_right:)
-     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * A notification to ask the server to exit its process. The server should exit with success
+     * code 0 if the shutdown request has been received before; otherwise with error code 1.
      * <p>
      * Notification:
      * <p>
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index ca086eae72f..fe34e79927e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -1,14 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
+
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
-
 @JsonSegment("client")
 public interface ClientApi {
     @JsonNotification
@@ -16,9 +20,13 @@ public interface ClientApi {
 
     /**
      * LogTrace Notification (:arrow_left:)
-     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * A notification to log the trace of the server’s execution. The amount and content of these
+     * notifications depends on the current trace configuration. If trace is 'off', the server
+     * should not send any logTrace notification. If trace is 'messages', the server should not add
+     * the 'verbose' field in the LogTraceParams.
      * <p>
-     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the
+     * server should send window/logMessage notifications.
      * <p>
      * Notification:
      * <p>
@@ -27,11 +35,12 @@ public interface ClientApi {
      */
     @JsonNotification
     void logTrace(LogTraceParams params);
-    //region Window
+    // region Window
 
     /**
      * ShowMessage Notification (:arrow_left:)
-     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * The show message notification is sent from a server to a client to ask the client to display
+     * a particular message in the user interface.
      * <p>
      * Notification:
      * <p>
@@ -45,7 +54,9 @@ public interface ClientApi {
 
     /**
      * ShowMessage Request (:arrow_right_hook:)
-     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     * The show message request is sent from a server to a client to ask the client to display a
+     * particular message in the user interface. In addition to the show message notification the
+     * request allows to pass actions and to wait for an answer from the client.
      */
     @JsonRequest
     @Nullable
@@ -56,7 +67,8 @@ public interface ClientApi {
      * Show Document Request (:arrow_right_hook:)
      * New in version 3.16.0
      * <p>
-     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * The show document request is sent from a server to a client to ask the client to display a
+     * particular resource referenced by a URI in the user interface.
      * <p>
      * property path (optional): window.showDocument
      * property type: ShowDocumentClientCapabilities defined as follows:
@@ -66,7 +78,9 @@ public interface ClientApi {
 
 
     void taskFinished(TaskFinishedInfo info);
+
     void taskProgress(int position);
+
     void taskStarted(TaskStartedInfo info);
-    //endregion
+    // endregion
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
index 7ae00a584e7..d1ae6245f0d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 record LogMessageParams(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
index b5995ff5220..9328544be6c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
index df586cac66d..79e94cc39bb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record MessageActionItem(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
index cb8c20dd311..8564f136f36 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
@@ -1,28 +1,31 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public enum MessageType {
-        Unused,
-        /**
-         * An error message.
-         */
-        Error,
-        /**
-         * A warning message.
-         */
-        Warning,
-        /**
-         * An information message.
-         */
-        Info,
-        /**
-         * A log message.
-         */
-        Log,
-        /**
-         * A debug message.
-         *
-         * @proposed
-         * @since 3.18.0
-         */
-        Debug
-    }
+    Unused,
+    /**
+     * An error message.
+     */
+    Error,
+    /**
+     * A warning message.
+     */
+    Warning,
+    /**
+     * An information message.
+     */
+    Info,
+    /**
+     * A log message.
+     */
+    Log,
+    /**
+     * A debug message.
+     *
+     * @proposed
+     * @since 3.18.0
+     */
+    Debug
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index 17502b1a910..1e3050bbfde 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import de.uka.ilkd.key.pp.Range;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
index b91a100858a..bb455cbebd5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record ShowDocumentResult(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
index 9bf22a6f552..5b0a6fc0286 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record ShowMessageParams(
@@ -10,5 +13,5 @@ public record ShowMessageParams(
          * The actual message.
          */
         String message) {
-    
+
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 49e662c6524..6dcc7164acc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import java.util.List;
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index b275265b6c7..5f2335e5ef3 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -1,11 +1,15 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
+
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
-import org.keyproject.key.api.remoteclient.*;
 
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.remoteclient.*;
 
 class SimpleClient implements ClientApi {
 
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index 5e0c87e06f5..9e7869bdfaa 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -1,13 +1,8 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.remoteclient.ClientApi;
-
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
@@ -18,6 +13,14 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
+
 public class TestRpc {
     private Future<Void> clientListening, serverListening;
     private KeyApi keyApi;
diff --git a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
index 5d7647eaf34..5c02f2ba138 100644
--- a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
+++ b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.exploration;
 
+import java.io.File;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.logic.*;
 import de.uka.ilkd.key.nparser.KeyIO;
@@ -10,13 +12,13 @@
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+
+import org.key_project.util.collection.ImmutableList;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.key_project.util.collection.ImmutableList;
-
-import java.io.File;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -83,7 +85,7 @@ public void testAdditionAntec() {
 
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-                "Parent is marked as ExplorationNode and data contains Exploration Action");
+            "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -125,7 +127,7 @@ public void testAdditionSucc() {
         testAddition(withAddedTerm, justification, added, false);
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-                "Parent is marked as ExplorationNode and data contains Exploration Action");
+            "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -146,9 +148,9 @@ public void testChangeFormula() {
         assertSame(1, goals.size(), "Prerequisite for test");
         Sequent sequent = goals.head().node().sequent();
         PosInOccurrence pio =
-                new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
+            new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
         expService.applyChangeFormula(goals.head(), pio, sequent.succedent().get(0).formula(),
-                change);
+            change);
         ImmutableList<Goal> newCreatedGoals = currentProof.openGoals();
 
         assertEquals(2, newCreatedGoals.size(), "Two new goals created");
@@ -166,7 +168,7 @@ public void testChangeFormula() {
         assertNotNull(justificationBranch.node().lookup(ExplorationNodeData.class));
 
         assertEquals(new Name("hide_right"), hideNode.getAppliedRuleApp().rule().name(),
-                "Hide Right was applied");
+            "Hide Right was applied");
         // set all goals to interactive
         justificationBranch.setEnabled(true);
         // perform proof, it has to close
@@ -184,34 +186,34 @@ public void testChangeFormula() {
      */
     private void testAddition(Goal withAddedTerm, Goal justification, Term added, boolean antec) {
         Semisequent semiSeqAdded =
-                antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+            antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
         Semisequent parentSemiSeqOfAdded =
-                antec ? withAddedTerm.node().parent().sequent().antecedent()
-                        : withAddedTerm.node().parent().sequent().succedent();
+            antec ? withAddedTerm.node().parent().sequent().antecedent()
+                    : withAddedTerm.node().parent().sequent().succedent();
 
         Semisequent semiSeqUntouched =
-                !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+            !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
 
         Semisequent parentSemiSeqOfUntouched =
-                !antec ? withAddedTerm.node().parent().sequent().antecedent()
-                        : withAddedTerm.node().parent().sequent().succedent();
+            !antec ? withAddedTerm.node().parent().sequent().antecedent()
+                    : withAddedTerm.node().parent().sequent().succedent();
 
 
         assertSame(semiSeqAdded.size(), parentSemiSeqOfAdded.size() + 1,
-                "The size of the added semisequent has changed");
+            "The size of the added semisequent has changed");
         assertEquals(semiSeqAdded.get(0).formula(), added, "Added Term is indeed added");
         assertFalse(justification.isAutomatic(), "Justification branch is marked as interactive");
 
         assertSame(semiSeqUntouched.size(), parentSemiSeqOfUntouched.size(),
-                "The size if untouched semisequents is the same");
+            "The size if untouched semisequents is the same");
         assertEquals(semiSeqUntouched, parentSemiSeqOfUntouched,
-                "The  untouched semisequents are equal");
+            "The  untouched semisequents are equal");
 
         Node parent = withAddedTerm.node().parent();
 
         assertEquals(parent, justification.node().parent(), "Both nodes have the same parent");
         assertEquals(new Name("cut"), parent.getAppliedRuleApp().rule().name(),
-                "The addition was inserted using the cut rule");
+            "The addition was inserted using the cut rule");
     }
 
     /**
diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
index 087e4c5d59f..045e315d72c 100644
--- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
+++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
@@ -35,9 +35,12 @@ public void actionPerformed(ActionEvent e) {
             // This method delegates the request only to the UserInterfaceControl
             // which implements the functionality. No functionality is allowed in this method body!
             new Thread(() -> {
-                MainWindow.getInstance().getMediator().getUI().getProofControl()
-                        .stopAndWaitAutoMode();
-                ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
+                try {
+                    MainWindow.getInstance().getMediator().getUI().getProofControl()
+                            .stopAndWaitAutoMode();
+                    ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
+                } catch (InterruptedException ignore) {
+                }
             }).start();
         }
     };

From 82f54f01e8d5424e837d2dab50748f949517314f Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Thu, 5 Oct 2023 00:59:22 +0200
Subject: [PATCH 10/50] some functions for tff

---
 .../java/de/uka/ilkd/key/gui/Example.java     | 196 +++++++++++++++
 .../de/uka/ilkd/key/gui/ExampleChooser.java   | 179 --------------
 keyext.api/build.gradle                       |   6 +
 .../org/keyproject/key/FileTypeAdapter.java   |  20 ++
 .../org/keyproject/key/remoteapi/KeyApi.java  |  58 +++++
 .../keyproject/key/remoteapi/KeyApiImpl.java  |  56 +++++
 .../key/remoteapi/KeyExampleApi.java          |  14 ++
 .../keyproject/key/remoteapi/KeyMetaApi.java  |  21 ++
 .../key/remoteapi/MacroDescription.java       |   9 +
 .../org/keyproject/key/remoteapi/Main.java    |  63 +++++
 .../org/keyproject/key/remoteapi/ProofId.java |   4 +
 .../key/remoteapi/ProofLoading.java           |  67 ++++++
 .../keyproject/key/remoteapi/TraceValue.java  |   5 +
 .../keyproject/key/remoteclient/Client.java   |  53 +++++
 .../key/remoteclient/ClientApi.java           | 224 ++++++++++++++++++
 .../key/remoteclient/SimpleClient.java        |   9 +
 settings.gradle                               |   2 +
 17 files changed, 807 insertions(+), 179 deletions(-)
 create mode 100644 key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
 create mode 100644 keyext.api/build.gradle
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
new file mode 100644
index 00000000000..85a85b65df1
--- /dev/null
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
@@ -0,0 +1,196 @@
+package de.uka.ilkd.key.gui;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using the
+ * short file name w/o path.
+ * <p>
+ * Used for displaying files in the examples list w/o prefix
+ */
+public class Example {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Example.class);
+    /**
+     * This constant is accessed by the eclipse based projects.
+     */
+    public static final String KEY_FILE_NAME = "project.key";
+
+    private static final String PROOF_FILE_NAME = "project.proof";
+
+    /**
+     * The default category under which examples range if they do not have {@link #KEY_PATH}
+     * set.
+     */
+    public static final String DEFAULT_CATEGORY_PATH = "Unsorted";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree.
+     */
+    public static final String KEY_PATH = "example.path";
+
+    /**
+     * The {@link Properties} key to specify the name of the example. Directory name if left
+     * open.
+     */
+    public static final String KEY_NAME = "example.name";
+
+    /**
+     * The {@link Properties} key to specify the file for the example. KEY_FILE_NAME by default
+     */
+    public static final String KEY_FILE = "example.file";
+
+    /**
+     * The {@link Properties} key to specify the proof file in the tree. May be left open
+     */
+    public static final String KEY_PROOF_FILE = "example.proofFile";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree. Prefix to specify additional
+     * files to load. Append 1, 2, 3, ...
+     */
+    public static final String ADDITIONAL_FILE_PREFIX = "example.additionalFile.";
+
+    /**
+     * The {@link Properties} key to specify the path in the tree. Prefix to specify export
+     * files which are not shown as tabs in the example wizard but are extracted to Java
+     * projects in the Eclipse integration. Append 1, 2, 3, ...
+     */
+    public static final String EXPORT_FILE_PREFIX = "example.exportFile.";
+
+    public final File exampleFile;
+    public final File directory;
+    public final String description;
+    public final Properties properties;
+
+    public Example(File file) throws IOException {
+        this.exampleFile = file;
+        this.directory = file.getParentFile();
+        this.properties = new Properties();
+        StringBuilder sb = new StringBuilder();
+        extractDescription(file, sb, properties);
+        this.description = sb.toString();
+    }
+
+    public File getDirectory() {
+        return directory;
+    }
+
+    public File getProofFile() {
+        return new File(directory, properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
+    }
+
+    public File getObligationFile() {
+        return new File(directory, properties.getProperty(KEY_FILE, KEY_FILE_NAME));
+    }
+
+    public String getName() {
+        return properties.getProperty(KEY_NAME, directory.getName());
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public File getExampleFile() {
+        return exampleFile;
+    }
+
+    public List<File> getAdditionalFiles() {
+        var result = new ArrayList<File>();
+        int i = 1;
+        while (properties.containsKey(ADDITIONAL_FILE_PREFIX + i)) {
+            result.add(new File(directory, properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
+            i++;
+        }
+        return result;
+    }
+
+    public List<File> getExportFiles() {
+        ArrayList<File> result = new ArrayList<>();
+        int i = 1;
+        while (properties.containsKey(EXPORT_FILE_PREFIX + i)) {
+            result.add(new File(directory, properties.getProperty(EXPORT_FILE_PREFIX + i)));
+            i++;
+        }
+        return result;
+    }
+
+    public String[] getPath() {
+        return properties.getProperty(KEY_PATH, DEFAULT_CATEGORY_PATH).split("/");
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
+
+    public void addToTreeModel(DefaultTreeModel model) {
+        DefaultMutableTreeNode node =
+                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
+        node.add(new DefaultMutableTreeNode(this));
+    }
+
+    private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
+                                             int from) {
+        if (from == path.length) {
+            return root;
+        }
+        Enumeration<?> en = root.children();
+        while (en.hasMoreElements()) {
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) en.nextElement();
+            if (node.getUserObject().equals(path[from])) {
+                return findChild(node, path, from + 1);
+            }
+        }
+        // not found ==> add new
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(path[from]);
+        root.add(node);
+        return findChild(node, path, from + 1);
+    }
+
+    public boolean hasProof() {
+        return properties.containsKey(KEY_PROOF_FILE);
+    }
+
+    private static StringBuilder extractDescription(File file, StringBuilder sb,
+                                                    Properties properties) {
+        try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
+            String line;
+            boolean emptyLineSeen = false;
+            while ((line = r.readLine()) != null) {
+                if (emptyLineSeen) {
+                    sb.append(line).append("\n");
+                } else {
+                    String trimmed = line.trim();
+                    if (trimmed.length() == 0) {
+                        emptyLineSeen = true;
+                    } else if (trimmed.startsWith("#")) {
+                        // ignore
+                    } else {
+                        String[] entry = trimmed.split(" *[:=] *", 2);
+                        if (entry.length > 1) {
+                            properties.put(entry[0], entry[1]);
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            LOGGER.error("", e);
+            return sb;
+        }
+        return sb;
+    }
+}
\ No newline at end of file
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
index f4ee4884408..e37603b344e 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
@@ -37,15 +37,6 @@ public final class ExampleChooser extends JDialog {
      */
     public static final String EXAMPLES_PATH = "examples";
 
-    private static final long serialVersionUID = -4405666868752394532L;
-
-    /**
-     * This constant is accessed by the eclipse based projects.
-     */
-    public static final String KEY_FILE_NAME = "project.key";
-
-    private static final String PROOF_FILE_NAME = "project.proof";
-
     /**
      * Java property name to specify a custom key example folder.
      */
@@ -75,149 +66,7 @@ public final class ExampleChooser extends JDialog {
      */
     private Example selectedExample;
 
-    /**
-     * This class wraps a {@link File} and has a special {@link #toString()} method only using the
-     * short file name w/o path.
-     * <p>
-     * Used for displaying files in the examples list w/o prefix
-     */
-    public static class Example {
-        /**
-         * The default category under which examples range if they do not have {@link #KEY_PATH}
-         * set.
-         */
-        private static final String DEFAULT_CATEGORY_PATH = "Unsorted";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree.
-         */
-        private static final String KEY_PATH = "example.path";
-
-        /**
-         * The {@link Properties} key to specify the name of the example. Directory name if left
-         * open.
-         */
-        private static final String KEY_NAME = "example.name";
-
-        /**
-         * The {@link Properties} key to specify the file for the example. KEY_FILE_NAME by default
-         */
-        private static final String KEY_FILE = "example.file";
-
-        /**
-         * The {@link Properties} key to specify the proof file in the tree. May be left open
-         */
-        private static final String KEY_PROOF_FILE = "example.proofFile";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree. Prefix to specify additional
-         * files to load. Append 1, 2, 3, ...
-         */
-        private static final String ADDITIONAL_FILE_PREFIX = "example.additionalFile.";
-
-        /**
-         * The {@link Properties} key to specify the path in the tree. Prefix to specify export
-         * files which are not shown as tabs in the example wizard but are extracted to Java
-         * projects in the Eclipse integration. Append 1, 2, 3, ...
-         */
-        private static final String EXPORT_FILE_PREFIX = "example.exportFile.";
-
-        private final File exampleFile;
-        private final File directory;
-        private final String description;
-        private final Properties properties;
-
-        public Example(File file) throws IOException {
-            this.exampleFile = file;
-            this.directory = file.getParentFile();
-            this.properties = new Properties();
-            StringBuilder sb = new StringBuilder();
-            extractDescription(file, sb, properties);
-            this.description = sb.toString();
-        }
-
-        public File getDirectory() {
-            return directory;
-        }
 
-        public File getProofFile() {
-            return new File(directory, properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
-        }
-
-        public File getObligationFile() {
-            return new File(directory, properties.getProperty(KEY_FILE, KEY_FILE_NAME));
-        }
-
-        public String getName() {
-            return properties.getProperty(KEY_NAME, directory.getName());
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public File getExampleFile() {
-            return exampleFile;
-        }
-
-        public List<File> getAdditionalFiles() {
-            ArrayList<File> result = new ArrayList<>();
-            int i = 1;
-            while (properties.containsKey(ADDITIONAL_FILE_PREFIX + i)) {
-                result.add(new File(directory, properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
-                i++;
-            }
-            return result;
-        }
-
-        public List<File> getExportFiles() {
-            ArrayList<File> result = new ArrayList<>();
-            int i = 1;
-            while (properties.containsKey(EXPORT_FILE_PREFIX + i)) {
-                result.add(new File(directory, properties.getProperty(EXPORT_FILE_PREFIX + i)));
-                i++;
-            }
-            return result;
-        }
-
-        public String[] getPath() {
-            return properties.getProperty(KEY_PATH, DEFAULT_CATEGORY_PATH).split("/");
-        }
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        public void addToTreeModel(DefaultTreeModel model) {
-            DefaultMutableTreeNode node =
-                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
-            node.add(new DefaultMutableTreeNode(this));
-        }
-
-        private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
-                int from) {
-            if (from == path.length) {
-                return root;
-            }
-            Enumeration<?> en = root.children();
-            while (en.hasMoreElements()) {
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode) en.nextElement();
-                if (node.getUserObject().equals(path[from])) {
-                    return findChild(node, path, from + 1);
-                }
-            }
-            // not found ==> add new
-            DefaultMutableTreeNode node = new DefaultMutableTreeNode(path[from]);
-            root.add(node);
-            return findChild(node, path, from + 1);
-        }
-
-        public boolean hasProof() {
-            return properties.containsKey(KEY_PROOF_FILE);
-        }
-
-    }
 
     // -------------------------------------------------------------------------
     // constructors
@@ -352,34 +201,6 @@ private static String fileAsString(File f) {
         }
     }
 
-    private static StringBuilder extractDescription(File file, StringBuilder sb,
-            Properties properties) {
-        try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
-            String line;
-            boolean emptyLineSeen = false;
-            while ((line = r.readLine()) != null) {
-                if (emptyLineSeen) {
-                    sb.append(line).append("\n");
-                } else {
-                    String trimmed = line.trim();
-                    if (trimmed.length() == 0) {
-                        emptyLineSeen = true;
-                    } else if (trimmed.startsWith("#")) {
-                        // ignore
-                    } else {
-                        String[] entry = trimmed.split(" *[:=] *", 2);
-                        if (entry.length > 1) {
-                            properties.put(entry[0], entry[1]);
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            LOGGER.error("", e);
-            return sb;
-        }
-        return sb;
-    }
 
 
     private void updateDescription() {
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
new file mode 100644
index 00000000000..463b7dbc11a
--- /dev/null
+++ b/keyext.api/build.gradle
@@ -0,0 +1,6 @@
+dependencies {
+    implementation(project(":key.core"))
+    implementation(project(":key.ui"))
+
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
new file mode 100644
index 00000000000..67240012e90
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
@@ -0,0 +1,20 @@
+package org.keyproject.key;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.File;
+import java.io.IOException;
+
+public class FileTypeAdapter extends TypeAdapter<File> {
+    @Override
+    public void write(JsonWriter out, File value) throws IOException {
+        out.value(value.toString());
+    }
+
+    @Override
+    public File read(JsonReader in) throws IOException {
+        return new File(in.nextString());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
new file mode 100644
index 00000000000..76c2d1eefdd
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
@@ -0,0 +1,58 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public interface KeyApi extends KeyExampleApi, KeyMetaApi {
+    //region general server management
+    /**
+     * Shutdown Request (:leftwards_arrow_with_hook:)
+     The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+
+     If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+
+     Request:
+
+     method: ‘shutdown’
+     params: none
+     Response:
+
+     result: null
+     error: code and message set in case an exception happens during shutdown request.
+     */
+    @JsonRequest
+    Void shutdown();
+
+    /**
+     * Exit Notification (:arrow_right:)
+     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘exit’
+     * params: none
+     */
+    @JsonNotification
+    void exit();
+
+
+
+    interface SetTraceParams {
+        /**
+         * The new value that should be assigned to the trace setting.
+         */
+        TraceValue value = null;
+    }
+    /**
+     * SetTrace Notification
+     * A notification that should be used by the client to modify the trace setting of the server.
+     */
+    @JsonNotification
+    void setTrace(SetTraceParams params);
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
new file mode 100644
index 00000000000..0a967998dac
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
@@ -0,0 +1,56 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.api.KeYApi;
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.util.KeYConstants;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment
+class KeyApiImpl implements KeyApi {
+    @Override
+    @JsonRequest
+    public CompletableFuture<List<Example>> examples() {
+        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    }
+
+    @Override
+    public Void shutdown() {
+        return null;
+    }
+
+    @Override
+    public void exit() {
+
+    }
+
+    @Override
+    public void setTrace(SetTraceParams params) {
+
+    }
+
+    @Override
+    public CompletableFuture<String> getVersion() {
+        return CompletableFuture.completedFuture(KeYConstants.VERSION);
+    }
+
+    @Override
+    public CompletableFuture<List<MacroDescription>> getAvailableMacros() {
+        return CompletableFuture.completedFuture(
+                KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
+                        .toList()
+        );
+    }
+
+    @Override
+    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+        return CompletableFuture.completedFuture(
+                KeYApi.getScriptCommandApi().getScriptCommands().stream().toList());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
new file mode 100644
index 00000000000..f1fe80a6dfc
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment("examples")
+public interface KeyExampleApi {
+    @JsonRequest("list")
+    CompletableFuture<List<Example>> examples();
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
new file mode 100644
index 00000000000..e5538b30896
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
@@ -0,0 +1,21 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment("meta")
+public interface KeyMetaApi {
+    @JsonRequest
+    CompletableFuture<String> getVersion();
+
+    @JsonRequest
+    CompletableFuture<List<MacroDescription>> getAvailableMacros();
+
+    @JsonRequest
+    CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
new file mode 100644
index 00000000000..2f34d3e03ed
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.macros.ProofMacro;
+
+public record MacroDescription(String name, String description, String category) {
+    public static MacroDescription from(ProofMacro m) {
+        return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
new file mode 100644
index 00000000000..127b36a702c
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
@@ -0,0 +1,63 @@
+package org.keyproject.key.remoteapi;
+
+import com.google.gson.GsonBuilder;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.keyproject.key.FileTypeAdapter;
+import org.keyproject.key.remoteclient.ClientApi;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+public class Main {
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        var future = launch(System.out, System.in);
+        future.startListening();
+    }
+
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+        var localServices = getLocalServices();
+        var remoteInterfaces = getRemoteInterfaces();
+        var launcherBuilder = new Launcher.Builder<ClientApi>()
+                .setOutput(out)
+                .setInput(in)
+                .traceMessages(new PrintWriter(System.err))
+                .validateMessages(true);
+
+        launcherBuilder.configureGson(Main::configureJson);
+
+        //if (localServices != null && !localServices.isEmpty())
+        launcherBuilder.setLocalService(new KeyApiImpl());
+        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        launcherBuilder.setRemoteInterface(ClientApi.class);
+
+        var launcher = launcherBuilder.create();
+        return launcher;
+    }
+
+    public static void configureJson(GsonBuilder gsonBuilder) {
+        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+    }
+
+    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
+        return Collections.singleton(ClientApi.class);
+      /*  return ServiceLoader.load(ClientService.class)
+                .stream()
+                .map(ServiceLoader.Provider::type)
+                .collect(Collectors.toSet());
+       */
+    }
+
+    private static List<Object> getLocalServices() {
+        return Collections.singletonList(new KeyApiImpl());
+        /*return ServiceLoader.load(KeyService.class)
+                .stream().map(ServiceLoader.Provider::get)
+                .map(it -> (Object) it)
+                .toList();*/
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
new file mode 100644
index 00000000000..65db8662e4e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
@@ -0,0 +1,4 @@
+package org.keyproject.key.remoteapi;
+
+public record ProofId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
new file mode 100644
index 00000000000..7e99ffd0cf5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
@@ -0,0 +1,67 @@
+package org.keyproject.key.remoteapi;
+
+import de.uka.ilkd.key.api.ProofManagementApi;
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.io.File;
+import java.util.List;
+
+@JsonSegment
+public interface ProofLoading {
+    @JsonRequest ProofId loadExample(String id);
+
+    interface LoadParams {
+        File keyFile;
+        File javaFile;
+
+        List<File> classPath,
+        File bootClassPath, List<File> includes
+    }
+
+    /**
+     * @param keyFile
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadFromKeyFile(File keyFile) throws ProblemLoaderException {
+        return new ProofManagementApi(KeYEnvironment.load(keyFile));
+    }
+
+    /**
+     * @param location
+     * @param classPath
+     * @param bootClassPath
+     * @param includes
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadProof(File location, List<File> classPath,
+                                   File bootClassPath, List<File> includes) throws ProblemLoaderException {
+        return new ProofManagementApi(
+                KeYEnvironment.load(location, classPath, bootClassPath, includes));
+    }
+
+    /**
+     * @param javaSourceCode
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest ProofId loadProof(File javaSourceCode) throws ProblemLoaderException {
+        return loadProof(javaSourceCode, null, null, null);
+    }
+
+    /**
+     * Load a proof file, creates a KeY environment that can be accessed with other methods from
+     * this facade
+     *
+     * @param file Path to the source code folder/file or to a *.proof file
+     * @param classPaths Optionally: Additional specifications for API classes
+     * @param bootClassPath Optionally: Different default specifications for Java API
+     * @param includes Optionally: Additional includes to consider
+     */
+    @JsonRequest ProofId loadProofFile(File file, List<File> classPaths, File bootClassPath,
+                                       List<File> includes);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
new file mode 100644
index 00000000000..1d1d4859e57
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
@@ -0,0 +1,5 @@
+package org.keyproject.key.remoteapi;
+
+public enum TraceValue {
+    Off, Message, All;
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
new file mode 100644
index 00000000000..4fd0b792189
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
@@ -0,0 +1,53 @@
+package org.keyproject.key.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.keyproject.key.remoteapi.Main;
+import org.keyproject.key.remoteapi.KeyApi;
+
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.concurrent.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class Client {
+    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException, TimeoutException {
+        PipedInputStream inClient = new PipedInputStream();
+        PipedOutputStream outClient = new PipedOutputStream();
+        PipedInputStream inServer = new PipedInputStream();
+        PipedOutputStream outServer = new PipedOutputStream();
+
+        inClient.connect(outServer);
+        outClient.connect(inServer);
+
+        Launcher<ClientApi> serverLauncher = Main.launch(outServer, inServer);
+
+        var client = new SimpleClient();
+        Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
+                .setLocalService(client)
+                .setRemoteInterfaces(Collections.singleton(KeyApi.class))
+                .setInput(inClient)
+                .setOutput(outClient)
+                .configureGson(Main::configureJson)
+                .traceMessages(new PrintWriter(System.err))
+                .create();
+
+        Logger logger = Logger.getLogger(StreamMessageProducer.class.getName());
+        logger.setLevel(Level.SEVERE);
+
+        var clientListening = clientLauncher.startListening();
+        var serverListening = serverLauncher.startListening();
+
+        //clientLauncher.getRemoteProxy().examples();
+        serverLauncher.getRemoteProxy().sayHello("Alex");
+
+        serverListening.get(1, TimeUnit.SECONDS);
+        clientListening.get(1, TimeUnit.SECONDS);
+    }
+}
+
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
new file mode 100644
index 00000000000..23c3ddf9e39
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
@@ -0,0 +1,224 @@
+package org.keyproject.key.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
+
+import javax.annotation.Nullable;
+
+@JsonSegment
+public interface ClientApi {
+    @JsonNotification
+    void sayHello(String e);
+
+    /**
+     * LogTrace Notification (:arrow_left:)
+     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * <p>
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘$/logTrace’
+     * params: LogTraceParams defined as follows:
+     */
+    @JsonNotification
+    void logTrace(LogTraceParams params);
+
+    interface LogTraceParams {
+        /**
+         * The message to be logged.
+         */
+        @NonNull
+        String message = null;
+        /**
+         * Additional information that can be computed if the `trace` configuration
+         * is set to `'verbose'`
+         */
+        String verbose = null;
+    }
+
+    //region Window
+
+    /**
+     * ShowMessage Notification (:arrow_left:)
+     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘window/showMessage’
+     * params: ShowMessageParams defined as follows:
+     */
+    @JsonNotification
+    public void ShowMessage(ShowMessageParams params);
+
+    interface ShowMessageParams {
+        /**
+         * The message type. See {@link MessageType}.
+         */
+        MessageType type = null;
+
+        /**
+         * The actual message.
+         */
+        String message = null;
+    }
+
+    enum MessageType {
+
+        Unused,
+        /**
+         * An error message.
+         */
+        Error,
+        /**
+         * A warning message.
+         */
+        Warning,
+        /**
+         * An information message.
+         */
+        Info,
+        /**
+         * A log message.
+         */
+        Log,
+        /**
+         * A debug message.
+         *
+         * @proposed
+         * @since 3.18.0
+         */
+        Debug
+    }
+
+    /**
+     * ShowMessage Request (:arrow_right_hook:)
+     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     */
+    @JsonRequest
+    @Nullable
+    MessageActionItem ShowMessage(ShowMessageRequestParams params);
+
+    interface ShowMessageRequestParams {
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type = null;
+
+        /**
+         * The actual message
+         */
+        String message = null;
+
+        /**
+         * The message action items to present.
+         */
+        MessageActionItem[] actions = new MessageActionItem[0];
+    }
+
+    interface MessageActionItem {
+        /**
+         * A short title like 'Retry', 'Open Log' etc.
+         */
+        String title = null;
+    }
+
+    /**
+     * Show Document Request (:arrow_right_hook:)
+     * New in version 3.16.0
+     * <p>
+     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * <p>
+     * property path (optional): window.showDocument
+     * property type: ShowDocumentClientCapabilities defined as follows:
+     */
+    @JsonRequest
+    ShowDocumentResult showDocument(ShowDocumentParams params);
+
+    interface ShowDocumentParams {
+        /**
+         * The uri to show.
+         */
+        String uri;
+
+        /**
+         * Indicates to show the resource in an external program.
+         * To show, for example, `https://code.visualstudio.com/`
+         * in the default WEB browser set `external` to `true`.
+         */
+        Boolean external;
+
+        /**
+         * An optional property to indicate whether the editor
+         * showing the document should take focus or not.
+         * Clients might ignore this property if an external
+         * program is started.
+         */
+        Boolean takeFocus;
+
+        /**
+         * An optional selection range if the document is a text
+         * document. Clients might ignore the property if an
+         * external program is started or the file is not a text
+         * file.
+         */
+        Range selection;
+    }
+
+    defined
+
+    interface ShowDocumentResult {
+        /**
+         * A boolean indicating if the show was successful.
+         */
+        boolean success;
+    }
+
+    /**
+     * LogMessage Notification(:arrow_left:)
+     * <p>
+     * The log    message notification    is sent    from the    server to    the client    to ask    the client    to log
+     * a particular     message.
+     */
+    interface LogMessageParams {
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type;
+
+        /**
+         * The actual message
+         */
+        String message;
+    }
+
+    /**
+    Create Work
+
+    Done Progress(:arrow_right_hook:)
+
+    The window/workDoneProgress/    create request    is sent    from the    server to    the client    to ask
+    the clie nt     to create    a work    done progress.
+    */
+
+    interface WorkDoneProgressCreateParams {
+        /**
+         * The token to be used to report progress.
+         */
+        ProgressToken token;
+    }
+
+    @JsonNotification workDoneProgressCancel();
+    WorkDoneProgressCancelParams defined
+    interface WorkDoneProgressCancelParams {
+        /**
+         * The token to be used to report progress.
+         */
+        ProgressToken token;
+    }
+
+
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
new file mode 100644
index 00000000000..9578fb8b171
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.remoteclient;
+
+class SimpleClient implements ClientApi {
+
+    @Override
+    public void sayHello(String e) {
+        System.out.format("Hello, %s%n", e);
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index e71fc368308..a7fccaa51b6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,3 +13,5 @@ include 'keyext.ui.testgen'
 include 'keyext.proofmanagement'
 include 'keyext.exploration'
 include 'keyext.slicing'
+
+include 'keyext.api'

From 6623b4b31064a45c111c27a3390c17601afd094d Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 8 Oct 2023 13:43:38 +0200
Subject: [PATCH 11/50] different clients

---
 keyext.api/build.gradle                       |  24 +-
 .../key/{ => api}/FileTypeAdapter.java        |   2 +-
 .../key/{ => api}/remoteapi/KeyApi.java       |   7 +-
 .../key/{ => api}/remoteapi/KeyApiImpl.java   |   8 +-
 .../{ => api}/remoteapi/KeyExampleApi.java    |   2 +-
 .../key/{ => api}/remoteapi/KeyMetaApi.java   |   3 +-
 .../{ => api}/remoteapi/MacroDescription.java |   2 +-
 .../keyproject/key/api/remoteapi/ProofId.java |   4 +
 .../key/api/remoteapi/ProofLoading.java       |  19 ++
 .../key/{ => api}/remoteapi/TraceValue.java   |   2 +-
 .../key/api/remoteclient/ClientApi.java       |  65 +++++
 .../org/keyproject/key/remoteapi/Main.java    |  63 -----
 .../org/keyproject/key/remoteapi/ProofId.java |   4 -
 .../key/remoteapi/ProofLoading.java           |  67 ------
 .../key/remoteclient/ClientApi.java           | 224 ------------------
 .../key/remoteclient/SimpleClient.java        |   9 -
 keyext.api/src/main/python/keyapi/__init__.py |  17 ++
 .../java/org/keyproject/key/api}/Client.java  |  16 +-
 .../org/keyproject/key/api/SimpleClient.java  |  35 +++
 19 files changed, 182 insertions(+), 391 deletions(-)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/FileTypeAdapter.java (93%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyApi.java (92%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyApiImpl.java (88%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyExampleApi.java (89%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyMetaApi.java (85%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/MacroDescription.java (86%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/TraceValue.java (54%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
 create mode 100644 keyext.api/src/main/python/keyapi/__init__.py
 rename keyext.api/src/{main/java/org/keyproject/key/remoteclient => test/java/org/keyproject/key/api}/Client.java (80%)
 create mode 100644 keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java

diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 463b7dbc11a..0f3b2743c24 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -1,6 +1,28 @@
+plugins {
+    id 'application'
+
+    // Used to create a single executable jar file with all dependencies
+    // see task "shadowJar" below
+    // https://imperceptiblethoughts.com/shadow/
+    id 'com.github.johnrengelman.shadow' version "8.1.1"
+}
+
+description "Verification server interface via JSON-RPC"
+
 dependencies {
     implementation(project(":key.core"))
     implementation(project(":key.ui"))
 
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
-}
\ No newline at end of file
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
+    implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
+    implementation("info.picocli:picocli:4.7.5")
+    //for GraalVM annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
+}
+
+
+compileJava {
+    // for GraalVM options.compilerArgs += ["-Aproject=${project.group}/${project.name}"]
+}
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
similarity index 93%
rename from keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
rename to keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
index 67240012e90..9c03fdfae41 100644
--- a/keyext.api/src/main/java/org/keyproject/key/FileTypeAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
@@ -1,4 +1,4 @@
-package org.keyproject.key;
+package org.keyproject.key.api;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
similarity index 92%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 76c2d1eefdd..9a6e35fe2eb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,11 +1,8 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.gui.Example;
-import de.uka.ilkd.key.gui.ExampleChooser;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public interface KeyApi extends KeyExampleApi, KeyMetaApi {
@@ -26,7 +23,7 @@ The shutdown request is sent from the client to the server. It asks the server t
      error: code and message set in case an exception happens during shutdown request.
      */
     @JsonRequest
-    Void shutdown();
+    CompletableFuture<Void> shutdown();
 
     /**
      * Exit Notification (:arrow_right:)
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
similarity index 88%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
index 0a967998dac..33ae9c03aba 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.api.KeYApi;
 import de.uka.ilkd.key.gui.Example;
@@ -13,7 +13,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment
-class KeyApiImpl implements KeyApi {
+public class KeyApiImpl implements KeyApi {
     @Override
     @JsonRequest
     public CompletableFuture<List<Example>> examples() {
@@ -21,8 +21,8 @@ public CompletableFuture<List<Example>> examples() {
     }
 
     @Override
-    public Void shutdown() {
-        return null;
+    public CompletableFuture<Void> shutdown() {
+        return CompletableFuture.completedFuture(null);
     }
 
     @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
similarity index 89%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
index f1fe80a6dfc..b1bc064b954 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.gui.Example;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
similarity index 85%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
index e5538b30896..df0112c51f2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyMetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
@@ -1,7 +1,6 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
similarity index 86%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
index 2f34d3e03ed..ad6d12babf8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.macros.ProofMacro;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
new file mode 100644
index 00000000000..7d1d4eb5d6b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
@@ -0,0 +1,4 @@
+package org.keyproject.key.api.remoteapi;
+
+public record ProofId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
new file mode 100644
index 00000000000..49081037dc0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
@@ -0,0 +1,19 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+@JsonSegment
+public interface ProofLoading {
+    @JsonRequest
+    ProofId loadExample(String id);
+
+    /**
+     * @param params
+     * @return
+     * @throws ProblemLoaderException
+     */
+    @JsonRequest
+    EnvId load(LoadParams params) throws ProblemLoaderException;
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
similarity index 54%
rename from keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
index 1d1d4859e57..567b740d6d8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.remoteapi;
+package org.keyproject.key.api.remoteapi;
 
 public enum TraceValue {
     Off, Message, All;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
new file mode 100644
index 00000000000..6f02b10a186
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -0,0 +1,65 @@
+package org.keyproject.key.api.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import javax.annotation.Nullable;
+import java.util.concurrent.CompletableFuture;
+
+@JsonSegment
+public interface ClientApi {
+    @JsonNotification
+    void sayHello(String e);
+
+    /**
+     * LogTrace Notification (:arrow_left:)
+     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * <p>
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘$/logTrace’
+     * params: LogTraceParams defined as follows:
+     */
+    @JsonNotification
+    void logTrace(LogTraceParams params);
+    //region Window
+
+    /**
+     * ShowMessage Notification (:arrow_left:)
+     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘window/showMessage’
+     * params: ShowMessageParams defined as follows:
+     */
+    @JsonNotification("sm")
+    void showMessage(ShowMessageParams params);
+
+
+
+    /**
+     * ShowMessage Request (:arrow_right_hook:)
+     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     */
+    @JsonRequest
+    @Nullable
+    CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params);
+
+
+    /**
+     * Show Document Request (:arrow_right_hook:)
+     * New in version 3.16.0
+     * <p>
+     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * <p>
+     * property path (optional): window.showDocument
+     * property type: ShowDocumentClientCapabilities defined as follows:
+     */
+    @JsonRequest
+    CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
+    //endregion
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
deleted file mode 100644
index 127b36a702c..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/Main.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-import com.google.gson.GsonBuilder;
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.keyproject.key.FileTypeAdapter;
-import org.keyproject.key.remoteclient.ClientApi;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-public class Main {
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
-        var future = launch(System.out, System.in);
-        future.startListening();
-    }
-
-    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
-        var localServices = getLocalServices();
-        var remoteInterfaces = getRemoteInterfaces();
-        var launcherBuilder = new Launcher.Builder<ClientApi>()
-                .setOutput(out)
-                .setInput(in)
-                .traceMessages(new PrintWriter(System.err))
-                .validateMessages(true);
-
-        launcherBuilder.configureGson(Main::configureJson);
-
-        //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl());
-        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
-        launcherBuilder.setRemoteInterface(ClientApi.class);
-
-        var launcher = launcherBuilder.create();
-        return launcher;
-    }
-
-    public static void configureJson(GsonBuilder gsonBuilder) {
-        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
-    }
-
-    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
-        return Collections.singleton(ClientApi.class);
-      /*  return ServiceLoader.load(ClientService.class)
-                .stream()
-                .map(ServiceLoader.Provider::type)
-                .collect(Collectors.toSet());
-       */
-    }
-
-    private static List<Object> getLocalServices() {
-        return Collections.singletonList(new KeyApiImpl());
-        /*return ServiceLoader.load(KeyService.class)
-                .stream().map(ServiceLoader.Provider::get)
-                .map(it -> (Object) it)
-                .toList();*/
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
deleted file mode 100644
index 65db8662e4e..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofId.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-public record ProofId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
deleted file mode 100644
index 7e99ffd0cf5..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/ProofLoading.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-import de.uka.ilkd.key.api.ProofManagementApi;
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-import java.io.File;
-import java.util.List;
-
-@JsonSegment
-public interface ProofLoading {
-    @JsonRequest ProofId loadExample(String id);
-
-    interface LoadParams {
-        File keyFile;
-        File javaFile;
-
-        List<File> classPath,
-        File bootClassPath, List<File> includes
-    }
-
-    /**
-     * @param keyFile
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadFromKeyFile(File keyFile) throws ProblemLoaderException {
-        return new ProofManagementApi(KeYEnvironment.load(keyFile));
-    }
-
-    /**
-     * @param location
-     * @param classPath
-     * @param bootClassPath
-     * @param includes
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadProof(File location, List<File> classPath,
-                                   File bootClassPath, List<File> includes) throws ProblemLoaderException {
-        return new ProofManagementApi(
-                KeYEnvironment.load(location, classPath, bootClassPath, includes));
-    }
-
-    /**
-     * @param javaSourceCode
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest ProofId loadProof(File javaSourceCode) throws ProblemLoaderException {
-        return loadProof(javaSourceCode, null, null, null);
-    }
-
-    /**
-     * Load a proof file, creates a KeY environment that can be accessed with other methods from
-     * this facade
-     *
-     * @param file Path to the source code folder/file or to a *.proof file
-     * @param classPaths Optionally: Additional specifications for API classes
-     * @param bootClassPath Optionally: Different default specifications for Java API
-     * @param includes Optionally: Additional includes to consider
-     */
-    @JsonRequest ProofId loadProofFile(File file, List<File> classPaths, File bootClassPath,
-                                       List<File> includes);
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
deleted file mode 100644
index 23c3ddf9e39..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/ClientApi.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.keyproject.key.remoteclient;
-
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-
-import javax.annotation.Nullable;
-
-@JsonSegment
-public interface ClientApi {
-    @JsonNotification
-    void sayHello(String e);
-
-    /**
-     * LogTrace Notification (:arrow_left:)
-     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
-     * <p>
-     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘$/logTrace’
-     * params: LogTraceParams defined as follows:
-     */
-    @JsonNotification
-    void logTrace(LogTraceParams params);
-
-    interface LogTraceParams {
-        /**
-         * The message to be logged.
-         */
-        @NonNull
-        String message = null;
-        /**
-         * Additional information that can be computed if the `trace` configuration
-         * is set to `'verbose'`
-         */
-        String verbose = null;
-    }
-
-    //region Window
-
-    /**
-     * ShowMessage Notification (:arrow_left:)
-     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘window/showMessage’
-     * params: ShowMessageParams defined as follows:
-     */
-    @JsonNotification
-    public void ShowMessage(ShowMessageParams params);
-
-    interface ShowMessageParams {
-        /**
-         * The message type. See {@link MessageType}.
-         */
-        MessageType type = null;
-
-        /**
-         * The actual message.
-         */
-        String message = null;
-    }
-
-    enum MessageType {
-
-        Unused,
-        /**
-         * An error message.
-         */
-        Error,
-        /**
-         * A warning message.
-         */
-        Warning,
-        /**
-         * An information message.
-         */
-        Info,
-        /**
-         * A log message.
-         */
-        Log,
-        /**
-         * A debug message.
-         *
-         * @proposed
-         * @since 3.18.0
-         */
-        Debug
-    }
-
-    /**
-     * ShowMessage Request (:arrow_right_hook:)
-     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
-     */
-    @JsonRequest
-    @Nullable
-    MessageActionItem ShowMessage(ShowMessageRequestParams params);
-
-    interface ShowMessageRequestParams {
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type = null;
-
-        /**
-         * The actual message
-         */
-        String message = null;
-
-        /**
-         * The message action items to present.
-         */
-        MessageActionItem[] actions = new MessageActionItem[0];
-    }
-
-    interface MessageActionItem {
-        /**
-         * A short title like 'Retry', 'Open Log' etc.
-         */
-        String title = null;
-    }
-
-    /**
-     * Show Document Request (:arrow_right_hook:)
-     * New in version 3.16.0
-     * <p>
-     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
-     * <p>
-     * property path (optional): window.showDocument
-     * property type: ShowDocumentClientCapabilities defined as follows:
-     */
-    @JsonRequest
-    ShowDocumentResult showDocument(ShowDocumentParams params);
-
-    interface ShowDocumentParams {
-        /**
-         * The uri to show.
-         */
-        String uri;
-
-        /**
-         * Indicates to show the resource in an external program.
-         * To show, for example, `https://code.visualstudio.com/`
-         * in the default WEB browser set `external` to `true`.
-         */
-        Boolean external;
-
-        /**
-         * An optional property to indicate whether the editor
-         * showing the document should take focus or not.
-         * Clients might ignore this property if an external
-         * program is started.
-         */
-        Boolean takeFocus;
-
-        /**
-         * An optional selection range if the document is a text
-         * document. Clients might ignore the property if an
-         * external program is started or the file is not a text
-         * file.
-         */
-        Range selection;
-    }
-
-    defined
-
-    interface ShowDocumentResult {
-        /**
-         * A boolean indicating if the show was successful.
-         */
-        boolean success;
-    }
-
-    /**
-     * LogMessage Notification(:arrow_left:)
-     * <p>
-     * The log    message notification    is sent    from the    server to    the client    to ask    the client    to log
-     * a particular     message.
-     */
-    interface LogMessageParams {
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type;
-
-        /**
-         * The actual message
-         */
-        String message;
-    }
-
-    /**
-    Create Work
-
-    Done Progress(:arrow_right_hook:)
-
-    The window/workDoneProgress/    create request    is sent    from the    server to    the client    to ask
-    the clie nt     to create    a work    done progress.
-    */
-
-    interface WorkDoneProgressCreateParams {
-        /**
-         * The token to be used to report progress.
-         */
-        ProgressToken token;
-    }
-
-    @JsonNotification workDoneProgressCancel();
-    WorkDoneProgressCancelParams defined
-    interface WorkDoneProgressCancelParams {
-        /**
-         * The token to be used to report progress.
-         */
-        ProgressToken token;
-    }
-
-
-    //endregion
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java b/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
deleted file mode 100644
index 9578fb8b171..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/SimpleClient.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.keyproject.key.remoteclient;
-
-class SimpleClient implements ClientApi {
-
-    @Override
-    public void sayHello(String e) {
-        System.out.format("Hello, %s%n", e);
-    }
-}
diff --git a/keyext.api/src/main/python/keyapi/__init__.py b/keyext.api/src/main/python/keyapi/__init__.py
new file mode 100644
index 00000000000..8523f3801f5
--- /dev/null
+++ b/keyext.api/src/main/python/keyapi/__init__.py
@@ -0,0 +1,17 @@
+from keyapi.rpc import JsonRPCHandler, Client
+
+
+class KeyClient(Client):
+    def __int__(self):
+        pass
+
+    def handle(self, res):
+        print(res)
+
+
+class KeyStub(JsonRPCHandler):
+    def __init__(self, input, output):
+        super().__init__(input, output)
+
+    def list_examples(self):
+        return self._send("examples/list", [])
diff --git a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java b/keyext.api/src/test/java/org/keyproject/key/api/Client.java
similarity index 80%
rename from keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
rename to keyext.api/src/test/java/org/keyproject/key/api/Client.java
index 4fd0b792189..4922de0993a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/remoteclient/Client.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/Client.java
@@ -1,16 +1,18 @@
-package org.keyproject.key.remoteclient;
+package org.keyproject.key.api;
 
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
-import org.keyproject.key.remoteapi.Main;
-import org.keyproject.key.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintWriter;
 import java.util.Collections;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -24,7 +26,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        Launcher<ClientApi> serverLauncher = Main.launch(outServer, inServer);
+        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer);
 
         var client = new SimpleClient();
         Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
@@ -32,7 +34,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
                 .setRemoteInterfaces(Collections.singleton(KeyApi.class))
                 .setInput(inClient)
                 .setOutput(outClient)
-                .configureGson(Main::configureJson)
+                .configureGson(StartServer::configureJson)
                 .traceMessages(new PrintWriter(System.err))
                 .create();
 
@@ -49,5 +51,3 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         clientListening.get(1, TimeUnit.SECONDS);
     }
 }
-
-
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
new file mode 100644
index 00000000000..3370f6eb31f
--- /dev/null
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -0,0 +1,35 @@
+package org.keyproject.key.api;
+
+import org.keyproject.key.api.remoteclient.*;
+
+import javax.annotation.Nullable;
+import java.util.concurrent.CompletableFuture;
+
+class SimpleClient implements ClientApi {
+
+    @Override
+    public void sayHello(String e) {
+        System.out.format("Hello, %s%n", e);
+    }
+
+    @Override
+    public void logTrace(LogTraceParams params) {
+
+    }
+
+    @Override
+    public void userResponse(ShowMessageParams params) {
+
+    }
+
+    @Nullable
+    @Override
+    public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params) {
+        return null;
+    }
+}

From 5cbe177aefbb8390b60ee68cef657e0c71495ccd Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 13 Oct 2023 13:26:27 +0200
Subject: [PATCH 12/50] wip

---
 .../org/keyproject/key/api/StartServer.java   | 203 ++++++++++++++++++
 .../keyproject/key/api/remoteapi/EnvId.java   |   8 +
 .../key/api/remoteapi/LoadParams.java         |   8 +
 .../api/remoteclient/LogMessageParams.java    |  15 ++
 .../key/api/remoteclient/LogTraceParams.java  |  19 ++
 .../api/remoteclient/MessageActionItem.java   |   9 +
 .../key/api/remoteclient/MessageType.java     |  28 +++
 .../api/remoteclient/ShowDocumentParams.java  |  35 +++
 .../api/remoteclient/ShowDocumentResult.java  |  10 +
 .../api/remoteclient/ShowMessageParams.java   |  14 ++
 .../ShowMessageRequestParams.java             |  20 ++
 keyext.api/src/main/python/keyapi/rpc.py      |  76 +++++++
 keyext.api/src/main/python/main.py            |  13 ++
 13 files changed, 458 insertions(+)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
 create mode 100644 keyext.api/src/main/python/keyapi/rpc.py
 create mode 100644 keyext.api/src/main/python/main.py

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
new file mode 100644
index 00000000000..26837bb84b6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -0,0 +1,203 @@
+package org.keyproject.key.api;
+
+
+import com.google.gson.GsonBuilder;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
+import org.keyproject.key.api.remoteapi.KeyApiImpl;
+import org.keyproject.key.api.remoteclient.ClientApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+
+import javax.annotation.Nullable;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.10.23)
+ */
+@CommandLine.Command
+public class StartServer implements Runnable {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
+
+    //region CLI arguments
+    @Option(names = "--std", description = "use stdout and stdin for communication")
+    boolean stdStreams;
+    @Option(names = "--trace", description = "use stdout and stdin for communication")
+    boolean enableTracing;
+
+    @Option(names = "--server", paramLabel = "PORT", description = "enables the TCP server mode")
+    @Nullable
+    Integer serverPort;
+
+    @Option(names = "--connectTo", paramLabel = "PORT", description = "enables the TCP client mode")
+    @Nullable
+    Integer clientPort;
+
+
+    @Option(names = "--infile", paramLabel = "FILE or PIPE", description = "read from named pipe or file")
+    @Nullable
+    File inFile;
+
+    @Option(names = "--outfile", paramLabel = "FILE or PIPE", description = "write to named pipe or file")
+    File outFile;
+
+    @Option(names = {"-h", "--help"}, usageHelp = true, description = "display a help message")
+    boolean helpRequested = false;
+
+    @Option(names = "--websocket")
+    boolean websocket;
+    //endregion
+
+    public static void main(String[] args) {
+        new CommandLine(new StartServer()).execute(args);
+    }
+
+    private InputStream in;
+    private OutputStream out;
+
+    private void establishStreams() throws IOException {
+        in = System.in;
+        out = System.out;
+
+        if (stdStreams) {
+            return;
+        }
+
+        if (clientPort != null) {
+            var socket = new Socket(InetAddress.getLocalHost(), clientPort);
+            socket.setKeepAlive(true);
+            socket.setTcpNoDelay(true);
+            in = socket.getInputStream();
+            out = socket.getOutputStream();
+            return;
+        }
+
+        if (serverPort != null) {
+            var server = new ServerSocket(serverPort);
+            LOGGER.info("Waiting on port {}", serverPort);
+            var socket = server.accept();
+            LOGGER.info("Connection to client established: {}", socket.getRemoteSocketAddress());
+            socket.setKeepAlive(true);
+            socket.setTcpNoDelay(true);
+            in = socket.getInputStream();
+            out = socket.getOutputStream();
+            return;
+        }
+
+
+        if (inFile != null) {
+            in = new FileInputStream(inFile);
+        }
+
+        if (outFile != null) {
+            out = new FileOutputStream(outFile);
+        }
+
+        if (out == null || in == null) {
+            throw new IllegalStateException("Could not initialize the streams");
+        }
+    }
+
+
+    @Override
+    public void run() {
+        if (helpRequested) {
+            return;
+        }
+
+        /*
+        var server = new Server();
+        var connector = new ServerConnector();
+        server.addConnector(connector);
+        // Setup the basic application "context" for this application at "/"
+        // This is also known as the handler tree (in jetty speak)
+        var context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/");
+        server.setHandler(context);
+
+        // Initialize javax.websocket layer
+        JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
+        {
+            // Configure defaults for container
+            wsContainer.setDefaultMaxTextMessageBufferSize(65535);
+
+            // Add WebSocket endpoint to javax.websocket layer
+            wsContainer.addEndpoint(WebSocketEndpoint.class);
+        });*/
+
+
+        try {
+            if (websocket) {
+                var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
+                        .setOutput(out)
+                        .setInput(in)
+                        .traceMessages(new PrintWriter(System.err))
+                        .validateMessages(true);
+                launcherBuilder.configureGson(StartServer::configureJson);
+                launcherBuilder.setLocalService(new KeyApiImpl());
+                launcherBuilder.setRemoteInterface(ClientApi.class);
+                launcherBuilder.create().startListening().get();
+            } else {
+                establishStreams();
+                try (var lin = in; var lout = out) {
+                    var listener = launch(lout, lin);
+                    LOGGER.info("JSON-RPC is listening for requests");
+                    listener.startListening().get();
+                }
+            }
+        } catch (IOException | InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void configureJson(GsonBuilder gsonBuilder) {
+        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+    }
+
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+        // var localServices = getLocalServices();
+        // var remoteInterfaces = getRemoteInterfaces();
+        var launcherBuilder = new Launcher.Builder<ClientApi>()
+                .setOutput(out)
+                .setInput(in)
+                .traceMessages(new PrintWriter(System.err))
+                .validateMessages(true);
+
+        launcherBuilder.configureGson(StartServer::configureJson);
+
+        //if (localServices != null && !localServices.isEmpty())
+        launcherBuilder.setLocalService(new KeyApiImpl());
+        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        launcherBuilder.setRemoteInterface(ClientApi.class);
+
+        return launcherBuilder.create();
+    }
+
+
+    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
+        return Collections.singleton(ClientApi.class);
+      /*  return ServiceLoader.load(ClientService.class)
+                .stream()
+                .map(ServiceLoader.Provider::type)
+                .collect(Collectors.toSet());
+       */
+    }
+
+    private static List<Object> getLocalServices() {
+        return Collections.singletonList(new KeyApiImpl());
+        /*return ServiceLoader.load(KeyService.class)
+                .stream().map(ServiceLoader.Provider::get)
+                .map(it -> (Object) it)
+                .toList();*/
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
new file mode 100644
index 00000000000..3a2b5291d66
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.remoteapi;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (06.10.23)
+ */
+public record EnvId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
new file mode 100644
index 00000000000..7eadda846ba
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.remoteapi;
+
+import java.io.File;
+import java.util.List;
+
+public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
new file mode 100644
index 00000000000..7ae00a584e7
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -0,0 +1,15 @@
+package org.keyproject.key.api.remoteclient;
+
+record LogMessageParams(
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type,
+
+        /**
+         * The actual message
+         */
+        String message
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
new file mode 100644
index 00000000000..b5995ff5220
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -0,0 +1,19 @@
+package org.keyproject.key.api.remoteclient;
+
+import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
+
+public record LogTraceParams(
+        /**
+         * The message to be logged.
+         */
+        @NonNull
+        String messag,
+
+        /**
+         * Additional information that can be computed if the `trace` configuration
+         * is set to `'verbose'`
+         */
+        String verbose
+) {
+
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
new file mode 100644
index 00000000000..df586cac66d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.remoteclient;
+
+public record MessageActionItem(
+        /**
+         * A short title like 'Retry', 'Open Log' etc.
+         */
+        String title
+) {
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
new file mode 100644
index 00000000000..cb8c20dd311
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
@@ -0,0 +1,28 @@
+package org.keyproject.key.api.remoteclient;
+
+public enum MessageType {
+        Unused,
+        /**
+         * An error message.
+         */
+        Error,
+        /**
+         * A warning message.
+         */
+        Warning,
+        /**
+         * An information message.
+         */
+        Info,
+        /**
+         * A log message.
+         */
+        Log,
+        /**
+         * A debug message.
+         *
+         * @proposed
+         * @since 3.18.0
+         */
+        Debug
+    }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
new file mode 100644
index 00000000000..17502b1a910
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -0,0 +1,35 @@
+package org.keyproject.key.api.remoteclient;
+
+import de.uka.ilkd.key.pp.Range;
+
+public record ShowDocumentParams(
+        /**
+         * The uri to show.
+         */
+        String uri,
+
+        /**
+         * Indicates to show the resource in an external program.
+         * To show, for example, `https://code.visualstudio.com/`
+         * in the default WEB browser set `external` to `true`.
+         */
+        Boolean external,
+
+        /**
+         * An optional property to indicate whether the editor
+         * showing the document should take focus or not.
+         * Clients might ignore this property if an external
+         * program is started.
+         */
+        Boolean takeFocus,
+
+        /**
+         * An optional selection range if the document is a text
+         * document. Clients might ignore the property if an
+         * external program is started or the file is not a text
+         * file.
+         */
+        Range selection
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
new file mode 100644
index 00000000000..b91a100858a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowDocumentResult(
+        /**
+         * A boolean indicating if the show was successful.
+         */
+        boolean success
+) {
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
new file mode 100644
index 00000000000..9bf22a6f552
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowMessageParams(
+        /**
+         * The message type. See {@link MessageType}.
+         */
+        MessageType type,
+
+        /**
+         * The actual message.
+         */
+        String message) {
+    
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
new file mode 100644
index 00000000000..5e5f4f1410b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -0,0 +1,20 @@
+package org.keyproject.key.api.remoteclient;
+
+public record ShowMessageRequestParams(
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type,
+
+        /**
+         * The actual message
+         */
+        String message,
+
+        /**
+         * The message action items to present.
+         *
+         */
+        MessageActionItem[] actions
+) {
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/python/keyapi/rpc.py b/keyext.api/src/main/python/keyapi/rpc.py
new file mode 100644
index 00000000000..89dc6f3e041
--- /dev/null
+++ b/keyext.api/src/main/python/keyapi/rpc.py
@@ -0,0 +1,76 @@
+import abc
+import json
+from abc import abstractmethod
+from multiprocessing import Process, SimpleQueue, Lock, Value
+
+
+class Client(abc.ABC):
+    @abstractmethod
+    def handle(self, response):
+        pass
+
+
+class JsonRPCHandler:
+    client: Client
+
+    def __init__(self, in_stream, out_stream):
+        self.input = in_stream
+        self.out = out_stream
+        self.__id = 0
+        self.client: Client
+
+        self._events = dict()
+        self._responses = dict()
+
+        # t: Process = Process(target=self.__read)
+        # t.start()
+
+    def read_message(self):
+        length = 0
+        for clength in self.input.readlines():
+            if clength.startswith("Content-Length:"):
+                length = int(clength[14:])
+                break
+
+        payload = self.input.read(2 + length)
+        r = json.loads(payload)
+        if "id" in r:  # JSON response for request
+            rid = r["id"]
+            # self._responses[rid] = r
+            # if rid in self._events:
+            #    self._events[rid].set()
+        else:  # JSON notification
+            self.client.handle(r)
+        return r
+
+    def __read(self):
+        while True:
+            self.read_message()
+
+    # def __create_event(self, number):
+    #    self._events[number] = Event()
+
+    def _send(self, method, params):
+        self.__id += 1
+        id = self.__id
+        # self.__create_event(self.__id)
+        req = {"jsonrpc": "2.0", "method": method, "params": params, "id": self.__id}
+
+        self._write(json.dumps(req))
+        # self._wait_for(self.__id)
+
+        r = dict()
+        while "id" in r and str(r[id]) != str(id):
+            r = self.read_message()
+        return r
+
+    def _write(self, msg):
+        length = len(msg)
+        self.out.write(f"Content-Length: {length}\r\n")
+        self.out.write("\r\n")
+        self.out.write(msg)
+        self.out.write("\r\n")
+        self.out.flush()
+
+   # def _wait_for(self, rid):
+   #     self._events[rid].wait()
diff --git a/keyext.api/src/main/python/main.py b/keyext.api/src/main/python/main.py
new file mode 100644
index 00000000000..a5cb45321d8
--- /dev/null
+++ b/keyext.api/src/main/python/main.py
@@ -0,0 +1,13 @@
+import socket
+from keyapi import KeyStub, KeyClient
+
+if __name__ == "__main__":
+    target = ("localhost", 5151)
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.connect(target)
+        input = s.makefile("r", newline="\r\n")
+        output = s.makefile("w", newline="\r\n")
+        stub = KeyStub(input, output)
+        stub.client = KeyClient()
+        print(stub.list_examples())

From fd5cb79e5953d17b8b6fa900e03652d9cc36428e Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 15 Oct 2023 17:27:16 +0200
Subject: [PATCH 13/50] Creating an JSON-RPC API

---
 .../java/de/uka/ilkd/key/Identifiable.java    |  11 +
 .../main/java/de/uka/ilkd/key/api/KeYApi.java | 102 ---------
 .../java/de/uka/ilkd/key/api/Matcher.java     | 210 ------------------
 .../de/uka/ilkd/key/api/ProjectedNode.java    |  65 ------
 .../java/de/uka/ilkd/key/api/ProofApi.java    |  90 --------
 .../uka/ilkd/key/api/ProofManagementApi.java  | 129 -----------
 .../ilkd/key/api/ProofScriptCommandCall.java  |  20 --
 .../java/de/uka/ilkd/key/api/ScriptApi.java   | 132 -----------
 .../de/uka/ilkd/key/api/ScriptResult.java     | 114 ----------
 .../de/uka/ilkd/key/api/ScriptResults.java    | 178 ---------------
 .../java/de/uka/ilkd/key/api/SearchNode.java  |  55 -----
 .../uka/ilkd/key/api/VariableAssignments.java | 154 -------------
 .../de/uka/ilkd/key/api/package-info.java     |   9 -
 .../uka/ilkd/key/control/KeYEnvironment.java  | 162 +++++++++-----
 .../ProofMacroFacade.java}                    |  15 +-
 .../scripts/ProofScriptCommandFacade.java}    |  16 +-
 .../main/java/de/uka/ilkd/key/proof/Goal.java |  47 +++-
 .../java/de/uka/ilkd/key/proof/Proof.java     |  12 +-
 .../speclang/njml/ContractLoadingTests.java   |  65 ++----
 .../de/uka/ilkd/key/gui/ExampleChooser.java   |   2 +-
 keyext.api.doc/build.gradle                   |   4 +
 .../src/main/java/ExtractMetaData.java        | 162 ++++++++++++++
 keyext.api/build.gradle                       |   3 +
 .../keyproject/key/api/FileTypeAdapter.java   |  20 --
 .../org/keyproject/key/api/KeyApiImpl.java    | 168 ++++++++++++++
 .../org/keyproject/key/api/StartServer.java   |  56 +----
 .../key/api/adapters/KeyAdapter.java          |  96 ++++++++
 .../key/api/adapters/package-info.java        |   7 +
 .../keyproject/key/api/data/ContractDesc.java |   8 +
 .../keyproject/key/api/data/FunctionDesc.java |  10 +
 .../org/keyproject/key/api/data/GoalText.java |  10 +
 .../keyproject/key/api/data/LoadParams.java   |  14 ++
 .../{remoteapi => data}/MacroDescription.java |   8 +-
 .../key/api/data/MacroStatistic.java          |   8 +
 .../org/keyproject/key/api/data/NodeDesc.java |   8 +
 .../key/api/data/PredicateDesc.java           |   8 +
 .../org/keyproject/key/api/data/PrintId.java  |   8 +
 .../key/api/data/ProblemDefinition.java       |  18 ++
 .../keyproject/key/api/data/ProofLoading.java |  42 ++++
 .../org/keyproject/key/api/data/SortDesc.java |   8 +
 .../key/api/data/StreategyOptions.java        |   8 +
 .../keyproject/key/api/data/TermAction.java   |   8 +
 .../keyproject/key/api/data/TermActionId.java |   8 +
 .../api/{remoteapi => data}/TraceValue.java   |   2 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |   8 +
 .../keyproject/key/api/data/TreeNodeId.java   |   8 +
 .../keyproject/key/api/remoteapi/EnvApi.java  |  31 +++
 .../keyproject/key/api/remoteapi/EnvId.java   |   8 -
 .../{KeyExampleApi.java => ExampleApi.java}   |   2 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |  32 +++
 .../keyproject/key/api/remoteapi/KeyApi.java  |  56 +----
 .../key/api/remoteapi/KeyApiImpl.java         |  56 -----
 .../key/api/remoteapi/LoadParams.java         |   8 -
 .../{KeyMetaApi.java => MetaApi.java}         |  11 +-
 .../key/api/remoteapi/ProofApi.java           |  48 ++++
 .../keyproject/key/api/remoteapi/ProofId.java |   4 -
 .../key/api/remoteapi/ProofLoading.java       |  19 --
 .../key/api/remoteapi/ProofTreeApi.java       |  26 +++
 .../key/api/remoteapi/ServerManagement.java   |  60 +++++
 .../key/api/remoteclient/ClientApi.java       |   2 +-
 .../org/keyproject/key/api/SimpleClient.java  |   2 +-
 .../key/api/{Client.java => TestRpc.java}     |  45 +++-
 settings.gradle                               |   1 +
 63 files changed, 1093 insertions(+), 1614 deletions(-)
 create mode 100644 key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
 rename key.core/src/main/java/de/uka/ilkd/key/{api/ProofMacroApi.java => macros/ProofMacroFacade.java} (83%)
 rename key.core/src/main/java/de/uka/ilkd/key/{api/ProofScriptCommandApi.java => macros/scripts/ProofScriptCommandFacade.java} (79%)
 create mode 100644 keyext.api.doc/build.gradle
 create mode 100644 keyext.api.doc/src/main/java/ExtractMetaData.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/MacroDescription.java (72%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/TraceValue.java (54%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyExampleApi.java => ExampleApi.java} (91%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyMetaApi.java => MetaApi.java} (64%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
 rename keyext.api/src/test/java/org/keyproject/key/api/{Client.java => TestRpc.java} (57%)

diff --git a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
new file mode 100644
index 00000000000..3be1d2528d8
--- /dev/null
+++ b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
@@ -0,0 +1,11 @@
+package de.uka.ilkd.key;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public interface Identifiable {
+    default String identification() {
+        return getClass().getName() + "_" + hashCode();
+    }
+}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
deleted file mode 100644
index dc89908c39c..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/KeYApi.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.io.File;
-import java.util.List;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.util.KeYConstants;
-
-/**
- * The Entry Point.
- * <p>
- * This facility is the entry point to the different KeY apis. Currently it support the
- * bootstrapping of the {@link KeYEnvironment} and the loading of proofs.
- * <p>
- * Created at 6.4.17
- *
- * @author Sarah Grebing
- * @author Alexander Weigl
- * @see ProofScriptCommandApi
- */
-public abstract class KeYApi {
-    private static final ProofMacroApi proofMacroApi = new ProofMacroApi();
-    private static final ProofScriptCommandApi scriptCommandApi = new ProofScriptCommandApi();
-
-    /**
-     * Create a new KeY API and create the sub APIs
-     */
-    private KeYApi() {
-    }
-
-    /**
-     *
-     * @return
-     */
-    public static String getVersion() {
-        return KeYConstants.INTERNAL_VERSION;
-    }
-
-
-    /**
-     * @return non-null
-     */
-    public static ProofScriptCommandApi getScriptCommandApi() {
-        return scriptCommandApi;
-    }
-
-    /**
-     * @return a non-null references to the macro api
-     */
-    public static ProofMacroApi getMacroApi() {
-        return proofMacroApi;
-    }
-
-    /**
-     * @param keyFile
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadFromKeyFile(File keyFile) throws ProblemLoaderException {
-        return new ProofManagementApi(KeYEnvironment.load(keyFile));
-    }
-
-    /**
-     * @param location
-     * @param classPath
-     * @param bootClassPath
-     * @param includes
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadProof(File location, List<File> classPath,
-            File bootClassPath, List<File> includes) throws ProblemLoaderException {
-        return new ProofManagementApi(
-            KeYEnvironment.load(location, classPath, bootClassPath, includes));
-    }
-
-    /**
-     * @param javaSourceCode
-     * @return
-     * @throws ProblemLoaderException
-     */
-    public static ProofManagementApi loadProof(File javaSourceCode) throws ProblemLoaderException {
-        return loadProof(javaSourceCode, null, null, null);
-    }
-
-    /**
-     * Load a proof file, creates a KeY environment that can be accessed with other methods from
-     * this facade
-     *
-     * @param file Path to the source code folder/file or to a *.proof file
-     * @param classPaths Optionally: Additional specifications for API classes
-     * @param bootClassPath Optionally: Different default specifications for Java API
-     * @param includes Optionally: Additional includes to consider
-     */
-    public abstract void loadProofFile(File file, List<File> classPaths, File bootClassPath,
-            List<File> includes);
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java b/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
deleted file mode 100644
index 2c628c45ff2..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.*;
-
-import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.logic.Name;
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.logic.SequentFormula;
-import de.uka.ilkd.key.logic.op.SchemaVariable;
-import de.uka.ilkd.key.nparser.KeyAst;
-import de.uka.ilkd.key.nparser.KeyIO;
-import de.uka.ilkd.key.nparser.ParsingFacade;
-import de.uka.ilkd.key.rule.*;
-import de.uka.ilkd.key.rule.inst.SVInstantiations;
-import de.uka.ilkd.key.rule.match.vm.VMTacletMatcher;
-
-import org.key_project.util.collection.ImmutableArray;
-import org.key_project.util.collection.ImmutableList;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Matcher to deal with matching a string pattern against a sequent
- *
- * @author S.Grebing
- */
-public class Matcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Matcher.class);
-    private final ProofApi api;
-
-    /**
-     * Creates a new matcher for the given proof and environment.
-     *
-     * @param api reference to proof api in order to get access to the key environment
-     */
-    public Matcher(ProofApi api) {
-        this.api = api;
-    }
-
-    /**
-     * Matches a sequent against a sequent pattern (a schematic sequent) returns a list of Nodes
-     * containing matching results from where the information about instantiated schema variables
-     * can be extracted. If no match was possible the list is exmpt.
-     *
-     * @param pattern a string representation of the pattern sequent against which the current
-     *        sequent should be matched
-     * @param currentSeq current concrete sequent
-     * @param assignments variables appearing in the pattern as schemavariables with their
-     *        corresponding type in KeY
-     * @return List of VariableAssignments (possibly empty if no match was found)
-     */
-    // List of VarAssignment
-    public List<VariableAssignments> matchPattern(String pattern, Sequent currentSeq,
-            VariableAssignments assignments) {
-        // copy services in order to not accidently set assignments and namespace for environment
-        Services copyServices = api.getEnv().getServices().copy(false);
-        // Aufbau der Deklarationen fuer den NameSpace
-        buildNameSpace(assignments, copyServices);
-        // Zusammenbau des Pseudotaclets
-        // Parsen des Taclets
-        String patternString = "matchPattern{\\assumes(" + pattern + ") \\find (==>)  \\add (==>)}";
-
-        Taclet t = parseTaclet(patternString, copyServices);
-
-        // Build Matcher for Matchpattern
-        VMTacletMatcher tacletMatcher = new VMTacletMatcher(t);
-
-        // patternSequent should not be null, as we have created it
-        assert t.ifSequent() != null;
-        Sequent patternSeq = t.ifSequent();
-        int asize = patternSeq.antecedent().size();
-        int size = asize + patternSeq.succedent().size();
-        // Iterator durch die Pattern-Sequent
-
-        List<SearchNode> finalCandidates = new ArrayList<>(100);
-        if (size > 0) {
-            // Iteratoren durch die Sequent
-            ImmutableArray<IfFormulaInstantiation> antecCand =
-                IfFormulaInstSeq.createList(currentSeq, true, copyServices);
-            ImmutableArray<IfFormulaInstantiation> succCand =
-                IfFormulaInstSeq.createList(currentSeq, false, copyServices);
-
-            SequentFormula[] patternArray = new SequentFormula[patternSeq.size()];
-            int i = 0;
-            for (SequentFormula fm : patternSeq) {
-                patternArray[i++] = fm;
-            }
-
-
-            Queue<SearchNode> queue = new LinkedList<>();
-            // init
-            queue.add(new SearchNode(patternArray, asize));
-
-
-            while (!queue.isEmpty()) {
-                SearchNode node = queue.remove();
-                boolean inAntecedent = node.isAntecedent();
-                LOGGER.debug(inAntecedent ? "In Antec: " : "In Succ");
-
-                IfMatchResult ma = tacletMatcher.matchIf((inAntecedent ? antecCand : succCand),
-                    node.getPatternTerm(), node.getMatchConditions(), copyServices);
-
-                if (!ma.getMatchConditions().isEmpty()) {
-                    ImmutableList<MatchConditions> testma = ma.getMatchConditions();
-
-                    for (MatchConditions matchConditions : testma) {
-                        SearchNode sn = new SearchNode(node, matchConditions);
-                        if (sn.isFinished()) {
-                            finalCandidates.add(sn);
-                        } else {
-                            queue.add(sn);
-                        }
-                    }
-                } else {
-                    LOGGER.debug("Pattern Empty");
-                }
-            }
-        }
-        List<VariableAssignments> matches = new ArrayList<>();
-        if (!finalCandidates.isEmpty()) {
-            for (SearchNode finalCandidate : finalCandidates) {
-                VariableAssignments va = extractAssignments(finalCandidate, assignments);
-                matches.add(va);
-            }
-        }
-        return matches;
-    }
-
-    /**
-     * Extract the matching results from each SearchNode and tranform these to Variable Assigments
-     *
-     * @param sn SearchNode
-     * @return VariableAssigments containing the assignments fo matching results to schemavariables
-     */
-    private VariableAssignments extractAssignments(SearchNode sn, VariableAssignments assignments) {
-        VariableAssignments va = new VariableAssignments();
-        SVInstantiations insts = sn.getInstantiations();
-        Set<String> varNames = assignments.getTypeMap().keySet();
-        for (String varName : varNames) {
-            SchemaVariable sv = insts.lookupVar(new Name(varName));
-            Object value = insts.getInstantiation(sv);
-            va.addAssignmentWithType(varName, value, assignments.getTypeMap().get(varName));
-        }
-        return va;
-
-    }
-
-    /**
-     * Adds the variables of VariableAssignments to the namespace
-     *
-     * @param assignments VariabelAssignments containing variable names and types
-     */
-    private void buildNameSpace(VariableAssignments assignments, Services services) {
-        String decalarations = buildDecls(assignments);
-        parseDecls(decalarations, services);
-
-    }
-
-    /**
-     * Builds a string that is used to create a new schemavariable declaration for the matchpattern
-     *
-     * @param assignments varaiables appearing as schema varaibels in the match pattern and their
-     *        types (in KeY)
-     * @return a String representing the declaration part of a taclet for teh matchpattern
-     */
-    private String buildDecls(VariableAssignments assignments) {
-        Map<String, VariableAssignments.VarType> typeMap = assignments.getTypeMap();
-        String schemaVars = "\\schemaVariables {\n";
-        final List<String> strn = new ArrayList<>();
-
-        typeMap.forEach((id, type) -> strn.add(toDecl(id, type)));
-        schemaVars += String.join("\n", strn);
-        schemaVars += "}";
-        LOGGER.debug("Schema Variables: {}", schemaVars);
-        return schemaVars;
-    }
-
-    private String toDecl(String id, VariableAssignments.VarType type) {
-        return type.getKeYDeclarationPrefix() + " " + id + ";";
-    }
-
-    /**
-     * Parse the declaration string for the current pattern and add the variables to the namespace
-     *
-     * @param s declaration part of a taclet
-     */
-    public void parseDecls(String s, Services services) {
-        try {
-            KeyIO io = new KeyIO(services);
-            KeyAst.File ctx = ParsingFacade.parseFile(CharStreams.fromString(s));
-            io.evalDeclarations(ctx);
-        } catch (Exception e) {
-            LOGGER.error("Exception while Parsing.", e);
-        }
-    }
-
-    private Taclet parseTaclet(String s, Services services) {
-        KeyIO io = new KeyIO(services);
-        KeyAst.File ctx = ParsingFacade.parseFile(CharStreams.fromString(s));
-        io.evalDeclarations(ctx);
-        io.evalFuncAndPred(ctx);
-        return io.findTaclets(ctx).get(0);
-    }
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
deleted file mode 100644
index d255acb757a..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProjectedNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.NodeInfo;
-
-/**
- * Wrapper for a proof node with utilities methods to
- *
- * @author Sarah Grebing
- * @author Alexander Weigl
- */
-public class ProjectedNode {
-
-    private final Node proofNode;
-
-    private final ProjectedNode parent;
-
-    /**
-     * Creates the wrapper object for a proof node
-     *
-     * @param node
-     * @param parent
-     */
-    public ProjectedNode(Node node, ProjectedNode parent) {
-        this.proofNode = node;
-        this.parent = parent;
-    }
-
-    /**
-     * Return the sequent of a proof node
-     *
-     * @return de.uka.ilkd.key.logic.Sequent s
-     */
-    public Sequent getSequent() {
-        return proofNode.sequent();
-    }
-
-    public ProjectedNode getParent() {
-        return this.parent;
-    }
-
-    public boolean isRoot() {
-        return getParent() == null;
-    }
-
-    public NodeInfo getNodeInfo() {
-        return proofNode.getNodeInfo();
-    }
-
-    public boolean isPseudoNode() {
-        return proofNode == null;
-    }
-
-    public Node getProofNode() {
-        return proofNode;
-    }
-
-    public static ProjectedNode pseudoRoot() {
-        return new ProjectedNode(null, null);
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
deleted file mode 100644
index 9a33c3a93b9..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofApi.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.Goal;
-import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.proof.mgt.RuleJustification;
-import de.uka.ilkd.key.rule.BuiltInRule;
-import de.uka.ilkd.key.rule.NoPosTacletApp;
-import de.uka.ilkd.key.rule.OneStepSimplifier;
-import de.uka.ilkd.key.util.MiscTools;
-
-import org.key_project.util.collection.ImmutableList;
-
-/**
- * @author Alexander Weigl
- * @version 1 (21.04.17)
- */
-public class ProofApi {
-    private final KeYEnvironment<?> env;
-    private final Proof proof;
-
-    public ProofApi(Proof proof, KeYEnvironment<?> currentEnv) {
-        this.proof = proof;
-        this.env = currentEnv;
-    }
-
-    public ScriptApi getScriptApi() {
-        return new ScriptApi(this);
-    }
-
-    /**
-     * Save current Proof-> ProofApi
-     */
-    public void saveProof() throws IOException {
-        // TODO
-    }
-
-    public KeYEnvironment<?> getEnv() {
-        return env;
-    }
-
-    public Proof getProof() {
-        return proof;
-    }
-
-    public List<ProjectedNode> getOpenGoals() {
-        ImmutableList<Goal> goals = proof.openGoals();
-        return goals.stream().map(g -> new ProjectedNode(g.node(), null))
-                .collect(Collectors.toList());
-    }
-
-    public ProjectedNode getFirstOpenGoal() {
-        return getOpenGoals().get(0);
-    }
-
-    public Set<String> getRules() {
-        Set<String> s = new TreeSet<>();
-        Goal goal = proof.getSubtreeGoals(proof.root()).head();
-
-        for (final BuiltInRule br : goal.ruleAppIndex().builtInRuleAppIndex().builtInRuleIndex()
-                .rules()) {
-            s.add(br.displayName());
-        }
-
-        Set<NoPosTacletApp> set = goal.ruleAppIndex().tacletIndex().allNoPosTacletApps();
-        OneStepSimplifier simplifier = MiscTools.findOneStepSimplifier(goal.proof());
-        if (simplifier != null && !simplifier.isShutdown()) {
-            set.addAll(simplifier.getCapturedTaclets());
-        }
-
-        for (final NoPosTacletApp app : set) {
-            RuleJustification just = goal.proof().mgt().getJustification(app);
-            if (just == null) {
-                continue; // do not break system because of this
-            }
-            s.add(app.taclet().displayName());
-        }
-
-        return s;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
deleted file mode 100644
index 6ef8191acf3..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofManagementApi.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.java.Services;
-import de.uka.ilkd.key.java.abstraction.KeYJavaType;
-import de.uka.ilkd.key.logic.op.IObserverFunction;
-import de.uka.ilkd.key.proof.init.ProofInputException;
-import de.uka.ilkd.key.proof.init.ProofOblInput;
-import de.uka.ilkd.key.speclang.Contract;
-import de.uka.ilkd.key.util.KeYTypeUtil;
-
-import org.key_project.util.collection.ImmutableSet;
-
-/**
- * This class serves as a facade to all functionalities that are needed for proof management, i.e.,
- * loading proof files, retrieving the proof obligations
- *
- * @author Sarah Grebing.
- */
-public class ProofManagementApi {
-    private final KeYEnvironment<?> currentEnv;
-    private final List<Contract> proofContracts = new ArrayList<>();
-    private HashSet<String> ruleNames;
-
-    public ProofManagementApi(KeYEnvironment<?> env) {
-        currentEnv = env;
-    }
-
-    public Services getServices() {
-        return currentEnv.getServices();
-    }
-
-    /**
-     * Retrieve a list of all available contracts
-     *
-     * @return {@link List<Contract>}; can be null if no file was loaded before (we should throw an
-     *         exception here)
-     */
-    public List<Contract> getProofContracts() {
-        if (proofContracts.isEmpty()) {
-            buildContracts();
-        }
-        return proofContracts;
-    }
-
-    /**
-     * constructs the possible proof contracts from the java info in the environment.
-     */
-    private void buildContracts() {
-        proofContracts.clear();
-        Set<KeYJavaType> kjts = currentEnv.getJavaInfo().getAllKeYJavaTypes();
-        for (KeYJavaType type : kjts) {
-            if (!KeYTypeUtil.isLibraryClass(type)) {
-                ImmutableSet<IObserverFunction> targets =
-                    currentEnv.getSpecificationRepository().getContractTargets(type);
-                for (IObserverFunction target : targets) {
-                    ImmutableSet<Contract> contracts =
-                        currentEnv.getSpecificationRepository().getContracts(type, target);
-                    for (Contract contract : contracts) {
-                        proofContracts.add(contract);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param contract
-     * @return
-     * @throws ProofInputException
-     */
-    public ProofApi startProof(ProofOblInput contract) throws ProofInputException {
-        return new ProofApi(currentEnv.createProof(contract), currentEnv);
-    }
-
-    /**
-     * @param contract
-     * @return
-     * @throws ProofInputException
-     */
-    public ProofApi startProof(Contract contract) throws ProofInputException {
-        return startProof(contract.createProofObl(currentEnv.getInitConfig(), contract));
-    }
-
-    public ProofApi getLoadedProof() {
-        return new ProofApi(currentEnv.getLoadedProof(), currentEnv);
-    }
-
-    /**
-     * Constructs a set containing all names of a taclets that are registered in the current
-     * environment.
-     * <p>
-     * The result is cached to speed up further calls.s
-     *
-     * @return always returns a non-null hash set.
-     */
-    public Set<String> getRuleNames() {
-        if (ruleNames == null) {
-            ruleNames = new HashSet<>();
-            currentEnv.getInitConfig().activatedTaclets()
-                    .forEach(taclet -> ruleNames.add(taclet.displayName()));
-
-            currentEnv.getInitConfig().builtInRules().forEach(t -> ruleNames.add(t.displayName()));
-        }
-        return ruleNames;
-    }
-
-    /*
-     * public KeYApi.CommandType getCommandType(String identifier) { if
-     * (KeYApi.getMacroApi().getMacro(identifier) != null) { return KeYApi.CommandType.MACRO; }
-     *
-     * if (KeYApi.getScriptCommandApi().getScriptCommands(identifier) != null) { return
-     * KeYApi.CommandType.SCRIPT; }
-     *
-     * if (getRuleNames().contains(identifier)) { return KeYApi.CommandType.RULE; }
-     *
-     * return KeYApi.CommandType.UNKNOWN; }
-     *
-     * enum CommandType { SCRIPT, RULE, MACRO, UNKNOWN; }
-     */
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java b/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
deleted file mode 100644
index 42c2e08f405..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandCall.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-
-/**
- * @param <T>
- * @author Alexander Weigl
- */
-public class ProofScriptCommandCall<T> {
-    final T parameter;
-    final ProofScriptCommand<T> command;
-
-    public ProofScriptCommandCall(ProofScriptCommand<T> command, T arguments) {
-        parameter = arguments;
-        this.command = command;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
deleted file mode 100644
index 7e5a8c5841b..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptApi.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-
-import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
-import de.uka.ilkd.key.logic.Sequent;
-import de.uka.ilkd.key.logic.Term;
-import de.uka.ilkd.key.macros.scripts.EngineState;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.macros.scripts.ScriptException;
-import de.uka.ilkd.key.proof.Goal;
-import de.uka.ilkd.key.proof.Node;
-
-import org.key_project.util.collection.ImmutableList;
-
-/**
- * This API class offers methods to apply script commands and match commands
- *
- * @author Alexander Weigl
- * @author S. Grebing
- */
-public class ScriptApi {
-    private final ProofApi api;
-    private final EngineState state;
-    private final Matcher matcher;
-
-    public ScriptApi(ProofApi proofApi) {
-        api = proofApi;
-        state = new EngineState(api.getProof());
-        matcher = new Matcher(api);
-    }
-
-    /**
-     * Matches a sequent against a sequent pattern (a schematic sequent) returns a list of Nodes
-     * containing matching results from where the information about instantiated schema variables
-     * can be extracted. If no match was possible the list is exmpt.
-     *
-     * @param pattern a string representation of the pattern sequent against which the current
-     *        sequent should be matched
-     * @param currentSeq current concrete sequent
-     * @param assignments variables appearing in the pattern as schemavariables with their
-     *        corresponding type in KeY
-     * @return List of VariableAssignments (possibly empty if no match was found)
-     */
-    public List<VariableAssignments> matchPattern(String pattern, Sequent currentSeq,
-            VariableAssignments assignments) {
-        return matcher.matchPattern(pattern, currentSeq, assignments);
-    }
-
-    /**
-     * Execute ScriptCommand onto goal node
-     *
-     * @param call to be applied with parameters set
-     * @param onNode the starting node
-     * @return List of new proof goals (possibly empty) Should throw an Exception if command not
-     *         applicable?
-     */
-    public <T> ScriptResults executeScriptCommand(ProofScriptCommandCall<T> call,
-            ProjectedNode onNode) throws ScriptException, InterruptedException {
-        // TODO VariableAssignments should be in instantiateCommand
-
-        state.setGoal(onNode.getProofNode());
-        call.command.execute((AbstractUserInterfaceControl) api.getEnv().getUi(), call.parameter,
-            state);
-
-        ImmutableList<Goal> goals = api.getProof().getSubtreeGoals(onNode.getProofNode());
-        // TODO filter for open goals if necessary
-        ScriptResults sr = new ScriptResults();
-
-        goals.forEach(g -> sr.add(ScriptResult.create(g.node(), onNode, call)));
-
-        return sr;
-    }
-
-    /**
-     * Evaluate the arguments passed to a command
-     *
-     * @param arguments
-     * @param <T>
-     * @return
-     */
-    public <T> ProofScriptCommandCall<T> instantiateCommand(ProofScriptCommand<T> command,
-            Map<String, String> arguments) throws Exception {
-        return new ProofScriptCommandCall<>(command, command.evaluateArguments(state, arguments));
-    }
-
-
-    /**
-     *
-     * @param term
-     * @param assignments
-     * @return
-     * @throws Exception either for Syntax or Type error
-     */
-    public Term toTerm(String term, VariableAssignments assignments) throws Exception {
-        // TODO
-        return null;
-    }
-
-    /**
-     * ~> Beweisbaum -> Shallow Copy hier implementieren
-     *
-     * @param root
-     * @param end
-     * @return
-     */
-    public ProjectedNode getIntermediateTree(ScriptResults root, ScriptResults end) {
-        /*
-         * Baum suche, startet bei allen Nodes von root.
-         *
-         * Endet sobald ein Node von end erreicht ist.
-         */
-        ProjectedNode pseudoRoot = ProjectedNode.pseudoRoot();
-        Queue<Node> queue = new LinkedList<>();
-        root.forEach(r -> queue.add(r.getProjectedNode().getProofNode()));
-
-        while (!queue.isEmpty()) {
-
-        }
-
-
-        return pseudoRoot;
-    }
-
-
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
deleted file mode 100644
index b5213cb0133..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResult.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.List;
-import java.util.Set;
-
-import de.uka.ilkd.key.java.PositionInfo;
-import de.uka.ilkd.key.proof.Node;
-
-/**
- * Object that represents one result goal of a script command It holds a reference to its parent
- * node and to the list of variables and their values for this result Created by S. Grebing
- */
-public class ScriptResult {
-
-    /**
-     * The current goal node
-     */
-    private ProjectedNode newNode;
-
-    /**
-     * the parent scriptNode to which the scriptcommand was applied
-     */
-    private ProjectedNode parentNode;
-
-    /**
-     * The scriptcommand that lead to this result
-     */
-    private ProofScriptCommandCall<?> call;
-
-    /**
-     * The reference to the variableassingments for this result
-     */
-    // private VariableAssignments assignments;
-
-    /**
-     * The list of labels for the result
-     */
-    private Set<List<String>> labels;
-
-    /**
-     * List with line numbers
-     */
-    private List<PositionInfo> linenumbers;
-
-    // getLineNumbers hier
-
-    /**
-     *
-     */
-    ScriptResult() {
-        // nulls
-    }
-
-    public static <T> ScriptResult create(Node node, ProjectedNode onNode,
-            ProofScriptCommandCall<T> call) {
-        ScriptResult sr = new ScriptResult();
-        sr.parentNode = onNode;
-        sr.newNode = new ProjectedNode(node, onNode);
-        sr.call = call;
-        return sr;
-    }
-
-    public ProjectedNode getNewNode() {
-        return newNode;
-    }
-
-    public ScriptResult setNewNode(ProjectedNode newNode) {
-        this.newNode = newNode;
-        return this;
-    }
-
-    public ProjectedNode getParentNode() {
-        return parentNode;
-    }
-
-    public ScriptResult setParentNode(ProjectedNode parentNode) {
-        this.parentNode = parentNode;
-        return this;
-    }
-
-    public ProofScriptCommandCall<?> getCall() {
-        return call;
-    }
-
-    public ScriptResult setCall(ProofScriptCommandCall<?> call) {
-        this.call = call;
-        return this;
-    }
-
-    public Set<List<String>> getLabels() {
-        return labels;
-    }
-
-    public ScriptResult setLabels(Set<List<String>> labels) {
-        this.labels = labels;
-        return this;
-    }
-
-    public List<PositionInfo> getLinenumbers() {
-        return linenumbers;
-    }
-
-    public ScriptResult setLinenumbers(List<PositionInfo> linenumbers) {
-        this.linenumbers = linenumbers;
-        return this;
-    }
-
-    public ProjectedNode getProjectedNode() {
-        return getNewNode();
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java b/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
deleted file mode 100644
index efc2bb66b2f..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ScriptResults.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
-
-/**
- * @author Alexander Weigl
- * @version 1 (21.04.17)
- */
-public class ScriptResults implements List<ScriptResult> {
-    private final List<ScriptResult> delegated = new ArrayList<>();
-
-    @Override
-    public int size() {
-        return delegated.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return delegated.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return delegated.contains(o);
-    }
-
-    @Override
-    public Iterator<ScriptResult> iterator() {
-        return delegated.iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return delegated.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return delegated.toArray(a);
-    }
-
-    @Override
-    public boolean add(ScriptResult scriptResult) {
-        return delegated.add(scriptResult);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return delegated.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return delegated.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends ScriptResult> c) {
-        return delegated.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends ScriptResult> c) {
-        return delegated.addAll(index, c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return delegated.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return delegated.retainAll(c);
-    }
-
-    @Override
-    public void replaceAll(UnaryOperator<ScriptResult> operator) {
-        delegated.replaceAll(operator);
-    }
-
-    @Override
-    public void sort(Comparator<? super ScriptResult> c) {
-        delegated.sort(c);
-    }
-
-    @Override
-    public void clear() {
-        delegated.clear();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return delegated.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return delegated.hashCode();
-    }
-
-    @Override
-    public ScriptResult get(int index) {
-        return delegated.get(index);
-    }
-
-    @Override
-    public ScriptResult set(int index, ScriptResult element) {
-        return delegated.set(index, element);
-    }
-
-    @Override
-    public void add(int index, ScriptResult element) {
-        delegated.add(index, element);
-    }
-
-    @Override
-    public ScriptResult remove(int index) {
-        return delegated.remove(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return delegated.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return delegated.lastIndexOf(o);
-    }
-
-    @Override
-    public ListIterator<ScriptResult> listIterator() {
-        return delegated.listIterator();
-    }
-
-    @Override
-    public ListIterator<ScriptResult> listIterator(int index) {
-        return delegated.listIterator(index);
-    }
-
-    @Override
-    public List<ScriptResult> subList(int fromIndex, int toIndex) {
-        return delegated.subList(fromIndex, toIndex);
-    }
-
-    @Override
-    public Spliterator<ScriptResult> spliterator() {
-        return delegated.spliterator();
-    }
-
-    @Override
-    public boolean removeIf(Predicate<? super ScriptResult> filter) {
-        return delegated.removeIf(filter);
-    }
-
-    @Override
-    public Stream<ScriptResult> stream() {
-        return delegated.stream();
-    }
-
-    @Override
-    public Stream<ScriptResult> parallelStream() {
-        return delegated.parallelStream();
-    }
-
-    @Override
-    public void forEach(Consumer<? super ScriptResult> action) {
-        delegated.forEach(action);
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java b/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
deleted file mode 100644
index bf08e9862ac..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import de.uka.ilkd.key.logic.SequentFormula;
-import de.uka.ilkd.key.logic.Term;
-import de.uka.ilkd.key.rule.MatchConditions;
-import de.uka.ilkd.key.rule.inst.SVInstantiations;
-
-/**
- * Created by sarah on 5/2/17.
- */
-public final class SearchNode {
-    private final SequentFormula[] pattern;
-    private final int pos;
-    private final int succAntPos;
-    private final MatchConditions mc;
-
-
-    public SearchNode(SequentFormula[] pattern, int succAntPos) {
-        this.pattern = pattern;
-        this.pos = 0;
-        this.succAntPos = succAntPos;
-        this.mc = MatchConditions.EMPTY_MATCHCONDITIONS;
-    }
-
-    public SearchNode(SearchNode parent, MatchConditions cond) {
-        this.pattern = parent.pattern;
-        this.succAntPos = parent.succAntPos;
-        int parentPos = parent.pos;
-        this.pos = parentPos + 1;
-        mc = cond;
-    }
-
-    public boolean isAntecedent() {
-        return pos < succAntPos;
-    }
-
-    public Term getPatternTerm() {
-        return pattern[pos].formula();
-    }
-
-    public boolean isFinished() {
-        return pos >= pattern.length;
-    }
-
-    public SVInstantiations getInstantiations() {
-        return mc == null ? null : mc.getInstantiations();
-    }
-
-    public MatchConditions getMatchConditions() {
-        return mc;
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java b/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
deleted file mode 100644
index 6f2fee63133..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/VariableAssignments.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Class to represent current Variable assigments. Created by S.Grebing
- */
-public class VariableAssignments {
-
-
-    public enum VarType {
-        INT("\\term int"), BOOL("\\term bool"), ANY("\\term any"), INT_ARRAY("\\term int[]"),
-        OBJECT("\\term Object"), HEAP("\\term Heap"), FIELD("\\term Field"),
-        LOCSET("\\term LocSet"), FORMULA("\\formula"), SEQ("\\term Seq");
-
-        private final String declPrefix;
-
-        VarType(String declPrefix) {
-            this.declPrefix = declPrefix;
-        }
-
-        public String getKeYDeclarationPrefix() {
-            return declPrefix;
-        }
-    }
-
-    /**
-     * Reference to parent assignments
-     */
-    private final VariableAssignments parent;
-
-    /**
-     * Current Assignments
-     */
-    private final Map<String, Object> currentAssignments;
-
-    /**
-     * Type Map of assignments
-     */
-    private final Map<String, VariableAssignments.VarType> typeMap;
-
-    /**
-     * Create new, empty variable assignment, to add variables
-     *
-     * @param parentAssignments the parent assignments
-     */
-    public VariableAssignments(VariableAssignments parentAssignments) {
-        this.currentAssignments = new HashMap<>();
-        this.typeMap = new HashMap<>();
-        this.parent = parentAssignments;
-    }
-
-
-    /**
-     * Default constructor
-     */
-    public VariableAssignments() {
-        this.currentAssignments = new HashMap<>();
-        this.typeMap = new HashMap<>();
-        this.parent = null;
-    }
-
-
-    /**
-     * Get the value of a stored variable name TODO Exception spezifischer
-     *
-     * @param varName
-     * @return Value of variable
-     */
-    public Object getVarValue(String varName) throws Exception {
-        if (currentAssignments.containsKey(varName)) {
-            return currentAssignments.get(varName);
-        } else {
-            if (parent != null) {
-                return parent.getVarValue(varName);
-            } else {
-                throw new Exception("Variable " + varName + " could not be found");
-            }
-        }
-    }
-
-    /**
-     * Add a variable assignment with type and value
-     *
-     * @param varName
-     * @param value
-     * @param type
-     */
-    public void addAssignmentWithType(String varName, Object value, VarType type) {
-        typeMap.put(varName, type);
-        currentAssignments.put(varName, value);
-
-    }
-
-    /**
-     * Add a variable assignment without type
-     *
-     * @param varName
-     * @param value
-     */
-    public void addAssignment(String varName, Object value) throws Exception {
-        if (typeMap.containsKey(varName)) {
-            currentAssignments.put(varName, value);
-        } else {
-            throw new Exception("Variable " + varName + "must be declared first");
-        }
-
-    }
-
-    /**
-     * TODO better exception Add a new type declaration
-     *
-     * @param varName
-     * @param type
-     */
-    public void addType(String varName, VarType type) throws Exception {
-        if (typeMap.containsKey(varName)) {
-            if (typeMap.get(varName) != type) {
-                throw new Exception("Variable " + varName + "was already declared with type "
-                    + typeMap.get(varName).toString());
-            }
-        } else {
-            typeMap.put(varName, type);
-        }
-    }
-
-    /**
-     * Returns the map of ID -> Type mappings
-     *
-     * @return
-     */
-    public Map<String, VariableAssignments.VarType> getTypeMap() {
-        return this.typeMap;
-    }
-
-
-    /*
-     * public Object getValue(String name) { return null; }
-     *
-     * public Type getType() { return null; }
-     *
-     * public void setType(Type type) {
-     *
-     * }
-     *
-     * public void setValue(String name) {
-     *
-     * }
-     */
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java b/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
deleted file mode 100644
index 402b65aa83c..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/api/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * This package gives an high-level entry point to the KeY world.
- *
- * @author Alexander Weigl
- * @author Sarah Grebing
- * @version 1 (21.04.17)
- * @see de.uka.ilkd.key.api.KeYApi
- */
-package de.uka.ilkd.key.api;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index 370527fb280..dc2936d64e7 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -3,13 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
-import java.io.File;
-import java.util.List;
-import java.util.Properties;
-import java.util.function.Consumer;
-
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.java.abstraction.KeYJavaType;
+import de.uka.ilkd.key.logic.op.IObserverFunction;
 import de.uka.ilkd.key.parser.Location;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.init.InitConfig;
@@ -20,7 +17,15 @@
 import de.uka.ilkd.key.proof.io.AbstractProblemLoader.ReplayResult;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.proof.mgt.SpecificationRepository;
+import de.uka.ilkd.key.rule.Rule;
+import de.uka.ilkd.key.speclang.Contract;
+import de.uka.ilkd.key.util.KeYTypeUtil;
 import de.uka.ilkd.key.util.Pair;
+import org.key_project.util.collection.ImmutableSet;
+
+import java.io.File;
+import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification
@@ -62,7 +67,7 @@ public class KeYEnvironment<U extends UserInterfaceControl> {
     /**
      * Constructor
      *
-     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig) {
@@ -72,11 +77,11 @@ public KeYEnvironment(U ui, InitConfig initConfig) {
     /**
      * Constructor
      *
-     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig, Proof loadedProof,
-            Pair<String, Location> proofScript, ReplayResult replayResult) {
+                          Pair<String, Location> proofScript, ReplayResult replayResult) {
         this.ui = ui;
         this.initConfig = initConfig;
         this.loadedProof = loadedProof;
@@ -175,15 +180,15 @@ public Proof createProof(ProofOblInput input) throws ProofInputException {
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
+     * @param location      The location to load.
+     * @param classPaths    The class path entries to use.
      * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param includes      Optional includes to consider.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-            List<File> classPaths, File bootClassPath, List<File> includes)
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes)
             throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, false);
     }
@@ -192,103 +197,103 @@ public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param location              The location to load.
+     * @param classPaths            The class path entries to use.
+     * @param bootClassPath         The boot class path to use.
+     * @param includes              Optional includes to consider.
      * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, null,
-            ruleCompletionHandler, false);
+                ruleCompletionHandler, false);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as
-     *        {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
-     *        will be used for new proofs.
+     *                                   {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
+     *                                   will be used for new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, null, null,
-            forceNewProfileOfNewProofs);
+                forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
-     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
+     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *        new proofs.
+     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *                                   new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, poPropertiesToForce,
-            ruleCompletionHandler,
-            null, forceNewProfileOfNewProofs);
+                ruleCompletionHandler,
+                null, forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile The {@link Profile} to use.
-     * @param location The location to load.
-     * @param classPaths The class path entries to use.
-     * @param bootClassPath The boot class path to use.
-     * @param includes Optional includes to consider.
-     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
-     * @param callbackProofLoaded An optional callback (called when the proof is loaded, before
-     *        replay)
+     * @param profile                    The {@link Profile} to use.
+     * @param location                   The location to load.
+     * @param classPaths                 The class path entries to use.
+     * @param bootClassPath              The boot class path to use.
+     * @param includes                   Optional includes to consider.
+     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
+     * @param callbackProofLoaded        An optional callback (called when the proof is loaded, before
+     *                                   replay)
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *        new proofs.
+     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *                                   new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-            List<File> classPaths, File bootClassPath, List<File> includes,
-            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-            Consumer<Proof> callbackProofLoaded,
-            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
+                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+                                                                   Consumer<Proof> callbackProofLoaded,
+                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         DefaultUserInterfaceControl ui = new DefaultUserInterfaceControl(ruleCompletionHandler);
         AbstractProblemLoader loader = ui.load(profile, location, classPaths, bootClassPath,
-            includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
+                includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
         InitConfig initConfig = loader.getInitConfig();
 
         return new KeYEnvironment<>(ui, initConfig, loader.getProof(),
-            loader.getProofScript(), loader.getResult());
+                loader.getProofScript(), loader.getResult());
     }
 
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File keyFile)
@@ -319,4 +324,41 @@ public boolean isDisposed() {
     public Pair<String, Location> getProofScript() {
         return proofScript;
     }
+
+    /**
+     * Retrieve a list of all available contracts for all known Java types.
+     *
+     * @return a non-null list, possible empty
+     */
+    public List<Contract> getAvailableContracts() {
+        List<Contract> proofContracts = new ArrayList<>(512);
+        Set<KeYJavaType> kjts = getJavaInfo().getAllKeYJavaTypes();
+        for (KeYJavaType type : kjts) {
+            if (!KeYTypeUtil.isLibraryClass(type)) {
+                ImmutableSet<IObserverFunction> targets = getSpecificationRepository().getContractTargets(type);
+                for (IObserverFunction target : targets) {
+                    ImmutableSet<Contract> contracts = getSpecificationRepository().getContracts(type, target);
+                    for (Contract contract : contracts) {
+                        proofContracts.add(contract);
+                    }
+                }
+            }
+        }
+        return proofContracts;
+    }
+
+
+    /**
+     * Constructs a list containing all known rules that are registered in the current
+     * environment.
+     *
+     * @return always returns a non-null list
+     */
+    public List<Rule> getRules() {
+        var rules = new ArrayList<Rule>(4096);
+        rules.addAll(getInitConfig().activatedTaclets());
+        getInitConfig().builtInRules().forEach(rules::add);
+        return rules;
+    }
+
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
similarity index 83%
rename from key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java
rename to key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
index fbdf19d343d..29b9579f640 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofMacroApi.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
@@ -1,25 +1,30 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
+package de.uka.ilkd.key.macros;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import de.uka.ilkd.key.macros.ProofMacro;
-
 /**
  * This class provides access to the proof script commands.
  *
  * @author Alexander Weigl
  * @version 1 (09.05.17)
  */
-public class ProofMacroApi {
+public class ProofMacroFacade {
+    private static ProofMacroFacade INSTANCE;
+
+    public static ProofMacroFacade instance() {
+        if (INSTANCE == null) INSTANCE = new ProofMacroFacade();
+        return INSTANCE;
+    }
+
     private final Map<String, ProofMacro> commandMap = new HashMap<>();
 
-    public ProofMacroApi() {
+    public ProofMacroFacade() {
         initialize();
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
similarity index 79%
rename from key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java
rename to key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
index bd23b64bc18..44a26161832 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/api/ProofScriptCommandApi.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
@@ -1,28 +1,34 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package de.uka.ilkd.key.api;
+package de.uka.ilkd.key.macros.scripts;
+
+import de.uka.ilkd.key.smt.IllegalNumberException;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-
 /**
  * This class provides access to the proof script commands.
  *
  * @author Alexander Weigl
  * @version 1 (21.04.17)
  */
-public class ProofScriptCommandApi {
+public class ProofScriptCommandFacade {
+    private static ProofScriptCommandFacade INSTANCE;
     private final Map<String, ProofScriptCommand<?>> commandMap = new HashMap<>();
 
-    public ProofScriptCommandApi() {
+    public ProofScriptCommandFacade() {
         initialize();
     }
 
+    public static ProofScriptCommandFacade instance() {
+        if(INSTANCE == null) INSTANCE = new ProofScriptCommandFacade();
+        return INSTANCE;
+    }
+
     @SuppressWarnings("rawtypes")
     private void initialize() {
         ServiceLoader<ProofScriptCommand> loader = ServiceLoader.load(ProofScriptCommand.class);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
index b86a6a47719..6198a8b88d9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
@@ -3,10 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.proof;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 import de.uka.ilkd.key.java.Services;
@@ -16,6 +13,7 @@
 import de.uka.ilkd.key.logic.op.ProgramVariable;
 import de.uka.ilkd.key.pp.LogicPrinter;
 import de.uka.ilkd.key.pp.NotationInfo;
+import de.uka.ilkd.key.proof.mgt.RuleJustification;
 import de.uka.ilkd.key.proof.proofevent.NodeChangeJournal;
 import de.uka.ilkd.key.proof.proofevent.RuleAppInfo;
 import de.uka.ilkd.key.proof.rulefilter.TacletFilter;
@@ -26,6 +24,7 @@
 import de.uka.ilkd.key.strategy.AutomatedRuleApplicationManager;
 import de.uka.ilkd.key.strategy.QueueRuleApplicationManager;
 import de.uka.ilkd.key.strategy.Strategy;
+import de.uka.ilkd.key.util.MiscTools;
 import de.uka.ilkd.key.util.properties.MapProperties;
 import de.uka.ilkd.key.util.properties.Properties;
 import de.uka.ilkd.key.util.properties.Properties.Property;
@@ -716,6 +715,13 @@ public List<RuleApp> getAllBuiltInRuleApps() {
         return ruleApps;
     }
 
+    /**
+     * Return a list with available taclet application on this goal.
+     */
+    public List<TacletApp> getAllTacletApps() {
+        return getAllTacletApps(proof().getServices());
+    }
+
     public List<TacletApp> getAllTacletApps(Services services) {
         RuleAppIndex index = ruleAppIndex();
         index.autoModeStopped();
@@ -740,4 +746,37 @@ protected boolean filter(Taclet taclet) {
         return allApps;
     }
 
+    /**
+     * Returns a list with all known rule applications within this proof goal.
+     */
+    public List<RuleApp> getAllAvailableRules() {
+        var taclets = getAllTacletApps();
+        var builtin = getAllBuiltInRuleApps();
+        builtin.addAll(taclets);
+        return builtin;
+    }
+
+    public List<Rule> getAvailableRules() {
+        var s = new ArrayList<Rule>(2048);
+        for (final BuiltInRule br : ruleAppIndex().builtInRuleAppIndex()
+                .builtInRuleIndex().rules()) {
+            s.add(br);
+        }
+
+        Set<NoPosTacletApp> set = ruleAppIndex().tacletIndex().allNoPosTacletApps();
+        OneStepSimplifier simplifier = MiscTools.findOneStepSimplifier(proof());
+        if (simplifier != null && !simplifier.isShutdown()) {
+            set.addAll(simplifier.getCapturedTaclets());
+        }
+
+        for (final NoPosTacletApp app : set) {
+            RuleJustification just = proof().mgt().getJustification(app);
+            if (just == null) {
+                continue; // do not break system because of this
+            }
+            s.add(app.taclet()); //TODO not good
+        }
+        return s;
+    }
+
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
index 6b97d88d82d..d7ac6c484d0 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
@@ -11,6 +11,7 @@
 import java.util.function.Predicate;
 import javax.swing.*;
 
+import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.*;
@@ -27,6 +28,7 @@
 import de.uka.ilkd.key.proof.replay.CopyingProofReplayer;
 import de.uka.ilkd.key.rule.NoPosTacletApp;
 import de.uka.ilkd.key.rule.OneStepSimplifier;
+import de.uka.ilkd.key.rule.Rule;
 import de.uka.ilkd.key.rule.merge.MergePartner;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp;
@@ -54,7 +56,7 @@
  * information, and methods to apply rules. Furthermore, it offers services that deliver the open
  * goals, namespaces and several other information about the current state of the proof.
  */
-public class Proof implements Named {
+public class Proof implements Named, Identifiable {
 
     /**
      * The time when the {@link Proof} instance was created.
@@ -1475,4 +1477,12 @@ public void copyCachedGoals(Proof referencedFrom, Consumer<Integer> callbackTota
             }
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String identification() {
+        return getClass().getName() + "_" + name + "_" + hashCode();
+    }
 }
diff --git a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
index 3561874cf37..21f2fbc3674 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
@@ -3,47 +3,32 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.speclang.njml;
 
-import java.io.File;
-
-import de.uka.ilkd.key.api.KeYApi;
-import de.uka.ilkd.key.api.ProofManagementApi;
-import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.init.ProofInputException;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.util.HelperClassForTests;
-
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.util.stream.Stream;
 
 public class ContractLoadingTests {
     public static final File EXAMPLES_DIR = new File("../key.ui/examples/");
 
-    @Test
-    public void sumAndMax() throws ProblemLoaderException {
-        final File javaFile =
-            new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java");
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Services services = file.getServices();
-        Logger LOGGER = LoggerFactory.getLogger(ContractLoadingTests.class);
-        for (Contract proofContract : file.getProofContracts()) {
-            LOGGER.info(proofContract.getPlainText(services));
-        }
+    static Stream<Arguments> files() {
+        return Stream.of(
+                new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
+                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java")
+        ).map(Arguments::of);
     }
 
-    @Test
-    public void issues1658() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-    }
-
-    @Test
+    @ParameterizedTest
+    @MethodSource("files")
     void issues1717() throws ProblemLoaderException, ProofInputException {
         File javaFile =
             new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1717/UnderscoreZero.java");
@@ -55,20 +40,8 @@ void issues1717() throws ProblemLoaderException, ProofInputException {
     }
 
     @Test
-    public void specMathJavaMathTest() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-    }
-
-    @Test
-    public void specMathBigintMathTest() throws ProblemLoaderException {
-        final File javaFile =
-            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java");
-        Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
+    public void nonEmptyContract(File javaFile) throws ProblemLoaderException {
+        KeYEnvironment<?> env = KeYEnvironment.load(javaFile);
+        Assertions.assertFalse(env.getAvailableContracts().isEmpty());
     }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
index e37603b344e..16420583f3a 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
@@ -301,7 +301,7 @@ public static List<Example> listExamples(File examplesDir) {
             new BufferedReader(new FileReader(index, StandardCharsets.UTF_8))) {
             while ((line = br.readLine()) != null) {
                 line = line.trim();
-                if (line.startsWith("#") || line.length() == 0) {
+                if (line.startsWith("#") || line.isEmpty()) {
                     continue;
                 }
                 File f = new File(examplesDir, line);
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
new file mode 100644
index 00000000000..f7aadd6467c
--- /dev/null
+++ b/keyext.api.doc/build.gradle
@@ -0,0 +1,4 @@
+dependencies {
+    implementation("com.github.javaparser:javaparser-core:3.25.5")
+    implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.5")
+}
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
new file mode 100644
index 00000000000..a9df59adef8
--- /dev/null
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -0,0 +1,162 @@
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.expr.MemberValuePair;
+import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
+import com.github.javaparser.javadoc.JavadocBlockTag;
+import com.github.javaparser.resolution.SymbolResolver;
+import com.github.javaparser.resolution.TypeSolver;
+import com.github.javaparser.symbolsolver.JavaSymbolSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.TypeSolverBuilder;
+import com.github.javaparser.utils.SourceRoot;
+
+import javax.annotation.Nonnull;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public class ExtractMetaData {
+    private static PrintWriter out;
+
+    public static void main(String[] args) throws IOException {
+        System.out.println("XXX" + Arrays.toString(args));
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
+        /*config.setAttributeComments(true);
+        config.setLexicalPreservationEnabled(false);
+        config.setStoreTokens(false);
+        config.setIgnoreAnnotationsWhenAttributingComments(true);
+        config.setDoNotAssignCommentsPrecedingEmptyLines(true);*/
+        //var root = Paths.get(args[0]);
+        TypeSolver typeSolver = new TypeSolverBuilder()
+                .withSourceCode("keyext.api/src/main/java")
+                .withSourceCode("key.core/src/main/java")
+                .withSourceCode("key.util/src/main/java")
+                .withCurrentJRE()
+                .build();
+        SymbolResolver symbolResolver = new JavaSymbolSolver(typeSolver);
+        config.setSymbolResolver(symbolResolver);
+        var source = new SourceRoot(Paths.get("keyext.api", "src", "main", "java"), config);
+        var cu = source.tryToParse();
+        var jsonSegment = Comparator.comparing(ExtractMetaData::getJsonSegment);
+        var segments = cu.stream().filter(ParseResult::isSuccessful)
+                .filter(it -> it.getResult().get().getPrimaryType().isPresent())
+                .map(it -> it.getResult().get().getPrimaryType().get())
+                .filter(ExtractMetaData::hasJsonSegment)
+                .sorted(jsonSegment)
+                .toList();
+
+        try (var out = new PrintWriter(new FileWriter("doc.md"))) {
+            ExtractMetaData.out = out;
+            printHeader(segments);
+            segments.forEach(ExtractMetaData::printDocumentation);
+            printFooter(segments);
+        }
+
+        // "org.keyproject.key.api.remoteapi.KeyApi";
+    }
+
+    private static void printDocumentation(TypeDeclaration<?> typeDeclaration) {
+        out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        out.println(getJavaDoc(typeDeclaration));
+        out.println("\n");
+
+        for (MethodDeclaration method : typeDeclaration.getMethods()) {
+            if (!isExported(method)) continue;
+
+            String callName = getCallName(method, typeDeclaration);
+
+            out.format("### %s (type: %s) %n%n", callName, type(method));
+
+            out.println(getJavaDoc(method));
+
+            out.println();
+        }
+    }
+
+    private static String getCallName(MethodDeclaration m, TypeDeclaration<?> td) {
+        var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+                        () -> m.getAnnotationByName("JsonRequest"))
+                .orElseThrow();
+
+        var segment = getJsonSegment(td) + "/";
+        String name = "";
+
+        if (annotationExpr.isMarkerAnnotationExpr()) {
+            name = m.getNameAsString();
+        } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+            var sma = annotationExpr.asSingleMemberAnnotationExpr();
+            name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+        } else {
+            var ne = annotationExpr.asNormalAnnotationExpr();
+            for (MemberValuePair pair : ne.getPairs()) {
+                switch (pair.getName().asString()) {
+                    case "value":
+                        name = pair.getValue().asLiteralStringValueExpr().getValue();
+                        break;
+                    case "useSegment":
+                        if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+                            segment = "";
+                        }
+                }
+            }
+        }
+        return segment + name;
+    }
+
+
+    @Nonnull
+    private static String getJavaDoc(NodeWithJavadoc<?> typeDeclaration) {
+        if (typeDeclaration.getJavadoc().isPresent()) {
+            final var javadoc = typeDeclaration.getJavadoc().get();
+            return javadoc.getDescription().toText()
+                    + "\n\n"
+                    + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+                    .collect(Collectors.joining("\n"));
+        }
+        return "";
+    }
+
+    private static String type(MethodDeclaration method) {
+        if (method.getAnnotationByName("JsonNotification").isPresent())
+            return "notification";
+        if (method.getAnnotationByName("JsonRequest").isPresent())
+            return "request";
+        return "";
+    }
+
+    private static boolean isExported(MethodDeclaration method) {
+        return method.getAnnotationByName("JsonNotification").isPresent()
+                || method.getAnnotationByName("JsonRequest").isPresent();
+    }
+
+    private static void printHeader(List<? extends TypeDeclaration<?>> segments) {
+        out.format("# KeY-API%n%n");
+    }
+
+    private static void printFooter(List<? extends TypeDeclaration<?>> segments) {
+
+
+    }
+
+
+    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+        return it.getAnnotationByName("JsonSegment").isPresent();
+    }
+
+    private static String getJsonSegment(TypeDeclaration<?> it) {
+        var ae = it.getAnnotationByName("JsonSegment").get();
+        return ae.asSingleMemberAnnotationExpr().getMemberValue()
+                .asLiteralStringValueExpr().getValue();
+    }
+}
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 0f3b2743c24..c2b84249430 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -18,6 +18,9 @@ dependencies {
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
     implementation("info.picocli:picocli:4.7.5")
+
+    implementation("com.google.guava:guava:32.1.3-jre")
+
     //for GraalVM annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
 }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
deleted file mode 100644
index 9c03fdfae41..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.keyproject.key.api;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FileTypeAdapter extends TypeAdapter<File> {
-    @Override
-    public void write(JsonWriter out, File value) throws IOException {
-        out.value(value.toString());
-    }
-
-    @Override
-    public File read(JsonReader in) throws IOException {
-        return new File(in.nextString());
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
new file mode 100644
index 00000000000..248210a9f7f
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -0,0 +1,168 @@
+package org.keyproject.key.api;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.gui.Example;
+import de.uka.ilkd.key.gui.ExampleChooser;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommandFacade;
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.Statistics;
+import de.uka.ilkd.key.util.KeYConstants;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.adapters.KeyAdapter;
+import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.remoteapi.KeyApi;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public record KeyApiImpl(KeyAdapter adapter) implements KeyApi {
+
+    @Override
+    @JsonRequest
+    public CompletableFuture<List<Example>> examples() {
+        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    }
+
+    @Override
+    public CompletableFuture<Void> shutdown() {
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public void exit() {
+    }
+
+    @Override
+    public void setTrace(SetTraceParams params) {
+
+    }
+
+    @Override
+    public CompletableFuture<String> getVersion() {
+        return CompletableFuture.completedFuture(KeYConstants.VERSION);
+    }
+
+    @Override
+    public CompletableFuture<List<ProofMacro>> getAvailableMacros() {
+        return CompletableFuture.completedFuture(
+                ProofMacroFacade.instance().getMacros().stream().toList()
+        );
+    }
+
+    @Override
+    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+        return CompletableFuture.completedFuture(
+                ProofScriptCommandFacade.instance().getScriptCommands().stream().toList());
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> macro(Proof id, String macroId, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<MacroStatistic> auto(Proof id, StreategyOptions options) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> dispose(Proof id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> goals(Proof id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> tree(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<NodeDesc> root(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Statistics> statistics(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<TreeNodeDesc> treeRoot(Proof proof) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<Function>> functions(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<GoalText> print(Node id) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TermAction>> actions(PrintId id, int pos) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<TermAction>> applyAction(TermActionId id) {
+        return null;
+    }
+
+    @Override
+    public void freePrint(PrintId id) {
+
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 26837bb84b6..408cc36acdd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -4,7 +4,7 @@
 import com.google.gson.GsonBuilder;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
-import org.keyproject.key.api.remoteapi.KeyApiImpl;
+import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteclient.ClientApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,9 +16,6 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -29,6 +26,8 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
+    private static KeyAdapter adapter;
+
     //region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
@@ -55,7 +54,7 @@ public class StartServer implements Runnable {
     boolean helpRequested = false;
 
     @Option(names = "--websocket")
-    boolean websocket;
+    boolean websocket = false;
     //endregion
 
     public static void main(String[] args) {
@@ -115,27 +114,6 @@ public void run() {
             return;
         }
 
-        /*
-        var server = new Server();
-        var connector = new ServerConnector();
-        server.addConnector(connector);
-        // Setup the basic application "context" for this application at "/"
-        // This is also known as the handler tree (in jetty speak)
-        var context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        context.setContextPath("/");
-        server.setHandler(context);
-
-        // Initialize javax.websocket layer
-        JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
-        {
-            // Configure defaults for container
-            wsContainer.setDefaultMaxTextMessageBufferSize(65535);
-
-            // Add WebSocket endpoint to javax.websocket layer
-            wsContainer.addEndpoint(WebSocketEndpoint.class);
-        });*/
-
-
         try {
             if (websocket) {
                 var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
@@ -144,7 +122,7 @@ public void run() {
                         .traceMessages(new PrintWriter(System.err))
                         .validateMessages(true);
                 launcherBuilder.configureGson(StartServer::configureJson);
-                launcherBuilder.setLocalService(new KeyApiImpl());
+                launcherBuilder.setLocalService(new KeyApiImpl(adapter));
                 launcherBuilder.setRemoteInterface(ClientApi.class);
                 launcherBuilder.create().startListening().get();
             } else {
@@ -160,8 +138,9 @@ public void run() {
         }
     }
 
+
     public static void configureJson(GsonBuilder gsonBuilder) {
-        gsonBuilder.registerTypeAdapter(File.class, new FileTypeAdapter());
+        adapter = new KeyAdapter(gsonBuilder);
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
@@ -174,30 +153,11 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
-
         //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl());
+        launcherBuilder.setLocalService(new KeyApiImpl(adapter));
         //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
         return launcherBuilder.create();
     }
-
-
-    private static Collection<Class<? extends ClientApi>> getRemoteInterfaces() {
-        return Collections.singleton(ClientApi.class);
-      /*  return ServiceLoader.load(ClientService.class)
-                .stream()
-                .map(ServiceLoader.Provider::type)
-                .collect(Collectors.toSet());
-       */
-    }
-
-    private static List<Object> getLocalServices() {
-        return Collections.singletonList(new KeyApiImpl());
-        /*return ServiceLoader.load(KeyService.class)
-                .stream().map(ServiceLoader.Provider::get)
-                .map(it -> (Object) it)
-                .toList();*/
-    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
new file mode 100644
index 00000000000..9168a2128f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -0,0 +1,96 @@
+package org.keyproject.key.api.adapters;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.gson.*;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import de.uka.ilkd.key.Identifiable;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.proof.Proof;
+import org.keyproject.key.api.data.MacroDescription;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Type;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+public class KeyAdapter {
+    private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    //private final TypeAdapter<Object> adaptor;
+
+    public KeyAdapter(GsonBuilder gson) {
+        gson.registerTypeAdapter(File.class, new FileTypeAdapter());
+        gson.registerTypeAdapter(Function.class, new FunctionTypeAdapter());
+        gson.registerTypeAdapter(Proof.class, new IdentifiableTypeAdapter());
+        gson.registerTypeAdapter(ProofMacro.class, new MacroTypeAdapter());
+        //adaptor = gson.create().getAdapter(Object.class);
+    }
+
+
+    //translating entities to identification strings
+    public String insert(Identifiable p) {
+        var id = p.identification();
+        if (!map.containsKey(id)) {
+            map.put(id, new WeakReference<>(p));
+        }
+        return id;
+    }
+
+    public Object find(String id) {
+        return map.get(id).get();
+    }
+    //endregion
+
+    class MacroTypeAdapter implements JsonSerializer<ProofMacro> {
+        @Override
+        public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
+            return context.serialize(MacroDescription.from(src));
+        }
+    }
+
+    class FileTypeAdapter extends TypeAdapter<File> {
+        @Override
+        public void write(JsonWriter out, File value) throws IOException {
+            out.value(value.toString());
+        }
+
+        @Override
+        public File read(JsonReader in) throws IOException {
+            return new File(in.nextString());
+        }
+    }
+
+    class FunctionTypeAdapter implements JsonSerializer<Function> {
+        @Override
+        public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
+            var obj = new JsonObject();
+            obj.add("name", context.serialize(src.name().toString()));
+            obj.add("skolemConstant", context.serialize(src.isSkolemConstant()));
+            obj.add("isRigid", context.serialize(src.isRigid()));
+            obj.add("isUnique", context.serialize(src.isUnique()));
+            obj.add("sort", context.serialize(src.sort()));
+            obj.add("argSorts", context.serialize(src.argSorts()));
+            return obj;
+        }
+    }
+
+    class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
+        @Override
+        public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return (Identifiable) find(json.getAsString());
+        }
+
+        @Override
+        public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext context) {
+            insert(src);
+            return context.serialize(src.identification());
+        }
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
new file mode 100644
index 00000000000..bbc28eec1ec
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Adapter classes for translating things from Java to JSON via GSON api.
+ *
+ * @author Alexander Weigl
+ * @version 1 (14.10.23)
+ */
+package org.keyproject.key.api.adapters;
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
new file mode 100644
index 00000000000..a81f8d863db
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record ContractDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
new file mode 100644
index 00000000000..0c612b44cc2
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.data;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record FunctionDesc(String name, String sort, List<String> sorts) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
new file mode 100644
index 00000000000..7a0e2f264e0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.pp.PositionTable;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record GoalText(PrintId id, String text, PositionTable table) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
new file mode 100644
index 00000000000..85ec900cd57
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.data;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ *
+ * @param keyFile
+ * @param javaFile
+ * @param classPath
+ * @param bootClassPath
+ * @param includes
+ */
+public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
similarity index 72%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index ad6d12babf8..0274bc38b30 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -1,7 +1,13 @@
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
 
+/**
+ *
+ * @param name
+ * @param description
+ * @param category
+ */
 public record MacroDescription(String name, String description, String category) {
     public static MacroDescription from(ProofMacro m) {
         return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
new file mode 100644
index 00000000000..74c2d9d1cc4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record MacroStatistic() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
new file mode 100644
index 00000000000..9bc8ad0cd04
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record NodeDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
new file mode 100644
index 00000000000..640c25371d6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record PredicateDesc(String name, String[] argSorts) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
new file mode 100644
index 00000000000..3d4893d43e4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record PrintId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
new file mode 100644
index 00000000000..4e2de0d4010
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -0,0 +1,18 @@
+package org.keyproject.key.api.data;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (15.10.23)
+ */
+public record ProblemDefinition(
+        @Nullable List<SortDesc> sorts,
+        @Nullable List<FunctionDesc> functions,
+        @Nullable List<PredicateDesc> predicates,
+        @Nullable List<String> antecTerms,
+        @Nullable List<String> succTerms
+) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
new file mode 100644
index 00000000000..14d737fd5d6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
@@ -0,0 +1,42 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Functionalities for loading proofs either from a built-in example, or from a set of files.
+ *
+ * @author Alexander Weigl
+ * @since v1
+ */
+@JsonSegment("loading")
+public interface ProofLoading {
+    /**
+     * I am not sure whether this is helpful. Mainly a feature for testing?!
+     * @param id
+     * @return
+     */
+    @JsonRequest
+    CompletableFuture<Proof> loadExample(String id);
+
+    /**
+     *
+     */
+    @JsonRequest
+    CompletableFuture<Proof> loadProblem(ProblemDefinition problem);
+
+    /**
+     * Test!
+     *
+     * @param params parameters for loading
+     * @return
+     * @throws ProblemLoaderException if something went wrong
+     */
+    @JsonRequest
+    CompletableFuture<KeYEnvironment<?>> load(LoadParams params) throws ProblemLoaderException;
+}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
new file mode 100644
index 00000000000..b582b4a73f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record SortDesc() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
new file mode 100644
index 00000000000..b73ee35b7b5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record StreategyOptions() {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
new file mode 100644
index 00000000000..b69046120f5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermAction(TermActionId commandId, String displayName) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
new file mode 100644
index 00000000000..7951c776af4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermActionId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
similarity index 54%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index 567b740d6d8..7f8c9564aa9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -1,4 +1,4 @@
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 public enum TraceValue {
     Off, Message, All;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
new file mode 100644
index 00000000000..213bb6b9dbe
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public class TreeNodeDesc {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
new file mode 100644
index 00000000000..3dba5cc492e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TreeNodeId(String id) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
new file mode 100644
index 00000000000..e82ca44ae28
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -0,0 +1,31 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.ContractDesc;
+import org.keyproject.key.api.data.SortDesc;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("env")
+public interface EnvApi {
+    @JsonRequest
+    CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<List<Function>> functions(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env);
+
+    @JsonRequest
+    CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
deleted file mode 100644
index 3a2b5291d66..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-/**
- * @author Alexander Weigl
- * @version 1 (06.10.23)
- */
-public record EnvId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
similarity index 91%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index b1bc064b954..9ccbb03049f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -8,7 +8,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment("examples")
-public interface KeyExampleApi {
+public interface ExampleApi {
     @JsonRequest("list")
     CompletableFuture<List<Example>> examples();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
new file mode 100644
index 00000000000..fe678b8f04e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -0,0 +1,32 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Node;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.GoalText;
+import org.keyproject.key.api.data.PrintId;
+import org.keyproject.key.api.data.TermAction;
+import org.keyproject.key.api.data.TermActionId;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("goal")
+public interface GoalApi {
+    @JsonRequest
+    CompletableFuture<GoalText> print(Node id);
+
+    @JsonRequest
+    CompletableFuture<List<TermAction>> actions(PrintId id, int pos);
+
+    @JsonRequest("apply_action")
+    CompletableFuture<List<TermAction>> applyAction(TermActionId id);
+
+    @JsonNotification("free")
+    void freePrint(PrintId id);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 9a6e35fe2eb..ac650359a74 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,55 +1,7 @@
 package org.keyproject.key.api.remoteapi;
 
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface KeyApi extends KeyExampleApi, KeyMetaApi {
-    //region general server management
-    /**
-     * Shutdown Request (:leftwards_arrow_with_hook:)
-     The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
-
-     If a server receives requests after a shutdown request those requests should error with InvalidRequest.
-
-     Request:
-
-     method: ‘shutdown’
-     params: none
-     Response:
-
-     result: null
-     error: code and message set in case an exception happens during shutdown request.
-     */
-    @JsonRequest
-    CompletableFuture<Void> shutdown();
-
-    /**
-     * Exit Notification (:arrow_right:)
-     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘exit’
-     * params: none
-     */
-    @JsonNotification
-    void exit();
-
-
-
-    interface SetTraceParams {
-        /**
-         * The new value that should be assigned to the trace setting.
-         */
-        TraceValue value = null;
-    }
-    /**
-     * SetTrace Notification
-     * A notification that should be used by the client to modify the trace setting of the server.
-     */
-    @JsonNotification
-    void setTrace(SetTraceParams params);
-    //endregion
+/**
+ * The combined interface that is provided by KeY.
+ */
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
deleted file mode 100644
index 33ae9c03aba..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import de.uka.ilkd.key.api.KeYApi;
-import de.uka.ilkd.key.gui.Example;
-import de.uka.ilkd.key.gui.ExampleChooser;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.util.KeYConstants;
-import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-@JsonSegment
-public class KeyApiImpl implements KeyApi {
-    @Override
-    @JsonRequest
-    public CompletableFuture<List<Example>> examples() {
-        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
-    }
-
-    @Override
-    public CompletableFuture<Void> shutdown() {
-        return CompletableFuture.completedFuture(null);
-    }
-
-    @Override
-    public void exit() {
-
-    }
-
-    @Override
-    public void setTrace(SetTraceParams params) {
-
-    }
-
-    @Override
-    public CompletableFuture<String> getVersion() {
-        return CompletableFuture.completedFuture(KeYConstants.VERSION);
-    }
-
-    @Override
-    public CompletableFuture<List<MacroDescription>> getAvailableMacros() {
-        return CompletableFuture.completedFuture(
-                KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
-                        .toList()
-        );
-    }
-
-    @Override
-    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
-        return CompletableFuture.completedFuture(
-                KeYApi.getScriptCommandApi().getScriptCommands().stream().toList());
-    }
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
deleted file mode 100644
index 7eadda846ba..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import java.io.File;
-import java.util.List;
-
-public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {
-
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
similarity index 64%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index df0112c51f2..a4a16b66b02 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyMetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,5 +1,6 @@
 package org.keyproject.key.api.remoteapi;
 
+import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
@@ -8,13 +9,13 @@
 import java.util.concurrent.CompletableFuture;
 
 @JsonSegment("meta")
-public interface KeyMetaApi {
-    @JsonRequest
+public interface MetaApi {
+    @JsonRequest("version")
     CompletableFuture<String> getVersion();
 
-    @JsonRequest
-    CompletableFuture<List<MacroDescription>> getAvailableMacros();
+    @JsonRequest("available_macros")
+    CompletableFuture<List<ProofMacro>> getAvailableMacros();
 
-    @JsonRequest
+    @JsonRequest("available_script_commands")
     CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
new file mode 100644
index 00000000000..16c9f390b89
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -0,0 +1,48 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.Statistics;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.data.MacroStatistic;
+import org.keyproject.key.api.data.NodeDesc;
+import org.keyproject.key.api.data.StreategyOptions;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public interface ProofApi {
+    @JsonRequest
+    CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<MacroStatistic> macro(Proof proof, String macroId, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<MacroStatistic> auto(Proof proof, StreategyOptions options);
+
+    @JsonRequest
+    CompletableFuture<Boolean> dispose(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> goals(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> tree(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<NodeDesc> root(Proof proof);
+
+    @JsonRequest
+    CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId);
+
+    @JsonRequest
+    CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId);
+
+    @JsonRequest
+    CompletableFuture<Statistics> statistics(Proof proof);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
deleted file mode 100644
index 7d1d4eb5d6b..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-public record ProofId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
deleted file mode 100644
index 49081037dc0..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.keyproject.key.api.remoteapi;
-
-import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
-@JsonSegment
-public interface ProofLoading {
-    @JsonRequest
-    ProofId loadExample(String id);
-
-    /**
-     * @param params
-     * @return
-     * @throws ProblemLoaderException
-     */
-    @JsonRequest
-    EnvId load(LoadParams params) throws ProblemLoaderException;
-}
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
new file mode 100644
index 00000000000..88f5cad0330
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -0,0 +1,26 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.TreeNodeDesc;
+import org.keyproject.key.api.data.TreeNodeId;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("proofTree")
+public interface ProofTreeApi {
+    @JsonRequest("root")
+    CompletableFuture<TreeNodeDesc> treeRoot(Proof id);
+
+    @JsonRequest("children")
+    CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId);
+
+    @JsonRequest("subtree")
+    CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
new file mode 100644
index 00000000000..ddd1fe408e6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -0,0 +1,60 @@
+package org.keyproject.key.api.remoteapi;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.TraceValue;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+@JsonSegment("server")
+public interface ServerManagement {
+    /**
+     * Shutdown Request (:leftwards_arrow_with_hook:)
+     * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+     * <p>
+     * If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+     * <p>
+     * Request:
+     * <p>
+     * method: ‘shutdown’
+     * params: none
+     * Response:
+     * <p>
+     * result: null
+     * error: code and message set in case an exception happens during shutdown request.
+     */
+    @JsonRequest
+    CompletableFuture<Void> shutdown();
+
+    /**
+     * Exit Notification (:arrow_right:)
+     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * <p>
+     * Notification:
+     * <p>
+     * method: ‘exit’
+     * params: none
+     */
+    @JsonNotification
+    void exit();
+
+
+    interface SetTraceParams {
+        /**
+         * The new value that should be assigned to the trace setting.
+         */
+        TraceValue value = null;
+    }
+
+    /**
+     * SetTrace Notification
+     * A notification that should be used by the client to modify the trace setting of the server.
+     */
+    @JsonNotification
+    void setTrace(SetTraceParams params);
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index 6f02b10a186..a7aebdca1bf 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -7,7 +7,7 @@
 import javax.annotation.Nullable;
 import java.util.concurrent.CompletableFuture;
 
-@JsonSegment
+@JsonSegment("client")
 public interface ClientApi {
     @JsonNotification
     void sayHello(String e);
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 3370f6eb31f..1b63674ce67 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -18,7 +18,7 @@ public void logTrace(LogTraceParams params) {
     }
 
     @Override
-    public void userResponse(ShowMessageParams params) {
+    public void showMessage(ShowMessageParams params) {
 
     }
 
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/Client.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
similarity index 57%
rename from keyext.api/src/test/java/org/keyproject/key/api/Client.java
rename to keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index 4922de0993a..edbe4aee393 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/Client.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -2,6 +2,9 @@
 
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -11,13 +14,17 @@
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class Client {
-    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException, TimeoutException {
+public class TestRpc {
+    private Future<Void> clientListening, serverListening;
+    private KeyApi keyApi;
+
+    @BeforeEach
+    void setup() throws IOException, ExecutionException, InterruptedException, TimeoutException {
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
         PipedInputStream inServer = new PipedInputStream();
@@ -41,13 +48,33 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         Logger logger = Logger.getLogger(StreamMessageProducer.class.getName());
         logger.setLevel(Level.SEVERE);
 
-        var clientListening = clientLauncher.startListening();
-        var serverListening = serverLauncher.startListening();
+        clientListening = clientLauncher.startListening();
+        serverListening = serverLauncher.startListening();
+
+        keyApi = clientLauncher.getRemoteProxy();
+    }
+
+    @AfterEach
+    void teardown() throws ExecutionException, InterruptedException, TimeoutException {
+        serverListening.cancel(true);
+        clientListening.cancel(true);
+    }
+
+
+    @Test
+    public void hello() {
 
-        //clientLauncher.getRemoteProxy().examples();
-        serverLauncher.getRemoteProxy().sayHello("Alex");
+    }
+
+    @Test
+    public void listMacros() throws ExecutionException, InterruptedException {
+        var examples = keyApi.getAvailableMacros().get();
+        System.out.println(examples);
+    }
 
-        serverListening.get(1, TimeUnit.SECONDS);
-        clientListening.get(1, TimeUnit.SECONDS);
+    @Test
+    public void listExamples() throws ExecutionException, InterruptedException {
+        var examples = keyApi.examples().get();
+        System.out.println(examples);
     }
 }
diff --git a/settings.gradle b/settings.gradle
index a7fccaa51b6..f2d7206d797 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,3 +15,4 @@ include 'keyext.exploration'
 include 'keyext.slicing'
 
 include 'keyext.api'
+include 'keyext.api.doc'

From acfeada8cf333a9099d0be963e3da9405c11ea1c Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 29 Oct 2023 16:45:43 +0100
Subject: [PATCH 14/50] working on a working minimal version

---
 .../src/main/java/org/key_project/Main.java   |    3 +-
 .../AbstractSymbolicExecutionTestCase.java    | 1636 +++++++++--------
 .../java/de/uka/ilkd/key/Identifiable.java    |   11 -
 .../key/control/AbstractProofControl.java     |   13 +-
 .../ilkd/key/control/DefaultProofControl.java |   51 +-
 .../de/uka/ilkd/key/control/ProofControl.java |   10 +-
 .../key/macros/ProofMacroFinishedInfo.java    |    1 +
 .../ilkd/key/macros/ProofMacroListener.java   |    2 +-
 .../main/java/de/uka/ilkd/key/proof/Node.java |   79 +-
 .../java/de/uka/ilkd/key/proof/Proof.java     |   12 +-
 .../ilkd/key/proof/io/TestZipProofSaving.java |    2 +-
 .../de/uka/ilkd/key/gui/ProofMacroWorker.java |   39 +-
 .../uka/ilkd/key/gui/ProofScriptWorker.java   |    7 +
 .../key/gui/actions/RunAllProofsAction.java   |   25 +-
 .../key/ui/ConsoleUserInterfaceControl.java   |    8 +-
 .../uka/ilkd/key/ui/MediatorProofControl.java |   22 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  487 ++++-
 .../org/keyproject/key/api/NodeTextDesc.java  |    8 +
 .../org/keyproject/key/api/NodeTextId.java    |   10 +
 .../org/keyproject/key/api/StartServer.java   |   16 +-
 .../keyproject/key/api/TermActionUtil.java    |  125 ++
 .../key/api/adapters/KeyAdapter.java          |   29 +-
 .../keyproject/key/api/data/ContractDesc.java |   11 +-
 .../keyproject/key/api/data/FunctionDesc.java |   13 +-
 .../org/keyproject/key/api/data/GoalText.java |   10 -
 .../key/api/data/KeyIdentifications.java      |  163 ++
 .../key/api/data/MacroStatistic.java          |    9 +-
 .../org/keyproject/key/api/data/NodeDesc.java |   12 +-
 .../org/keyproject/key/api/data/PrintId.java  |    8 -
 .../key/api/data/ProofMacroDesc.java          |   14 +
 .../key/api/data/ProofScriptCommandDesc.java  |   13 +
 .../org/keyproject/key/api/data/SortDesc.java |   13 +-
 .../keyproject/key/api/data/TermAction.java   |    8 -
 .../key/api/data/TermActionDesc.java          |   11 +
 .../keyproject/key/api/data/TermActionId.java |    6 -
 .../key/api/data/TermActionKind.java          |    9 +
 .../keyproject/key/api/data/TreeNodeId.java   |    6 -
 .../keyproject/key/api/internal/NodeText.java |   12 +
 .../keyproject/key/api/remoteapi/EnvApi.java  |   13 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |   17 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |    2 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |    9 +-
 .../key/api/remoteapi/PrintOptions.java       |    9 +
 .../key/api/remoteapi/ProofApi.java           |   23 +-
 .../ProofLoadApi.java}                        |   25 +-
 .../key/api/remoteapi/ProofTreeApi.java       |   10 +-
 .../key/api/remoteclient/ClientApi.java       |    7 +
 .../org/keyproject/key/api/SimpleClient.java  |   17 +
 .../java/org/keyproject/key/api/TestRpc.java  |    7 +-
 .../ProofExplorationServiceTest.java          |   47 +-
 50 files changed, 2000 insertions(+), 1100 deletions(-)
 delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
 rename keyext.api/src/main/java/org/keyproject/key/api/{data/ProofLoading.java => remoteapi/ProofLoadApi.java} (50%)

diff --git a/key.core.example/src/main/java/org/key_project/Main.java b/key.core.example/src/main/java/org/key_project/Main.java
index 51ba6c5547d..4da18d230e9 100644
--- a/key.core.example/src/main/java/org/key_project/Main.java
+++ b/key.core.example/src/main/java/org/key_project/Main.java
@@ -92,6 +92,7 @@ private static void proveEnvironmemt(KeYEnvironment<?> env) {
             for (Contract contract : proofContracts) {
                 proveContract(env, contract);
             }
+        } catch (InterruptedException ignored) {
         } finally {
             env.dispose(); // Ensure always that all instances of KeYEnvironment are disposed
         }
@@ -130,7 +131,7 @@ private static List<Contract> getContracts(KeYEnvironment<?> env) {
      * @param env the {@link KeYEnvironment} in which to prove the contract
      * @param contract the {@link Contract} to be proven
      */
-    private static void proveContract(KeYEnvironment<?> env, Contract contract) {
+    private static void proveContract(KeYEnvironment<?> env, Contract contract) throws InterruptedException {
         Proof proof = null;
         try {
             // Create proof
diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
index 95c6da8fe33..907a15d5c9d 100644
--- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
+++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
@@ -44,7 +44,6 @@
 import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
 import de.uka.ilkd.key.util.HelperClassForTests;
 import de.uka.ilkd.key.util.KeYConstants;
-
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableArray;
 import org.key_project.util.collection.ImmutableList;
@@ -52,11 +51,15 @@
 import org.key_project.util.helper.FindResources;
 import org.key_project.util.java.CollectionUtil;
 import org.key_project.util.java.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -66,7 +69,7 @@
  */
 public abstract class AbstractSymbolicExecutionTestCase {
     private static final Logger LOGGER =
-        LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
+            LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
 
     /**
      * <p>
@@ -83,7 +86,7 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * </p>
      */
     public static final boolean CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY =
-        Boolean.getBoolean("UPDATE_TEST_ORACLE");
+            Boolean.getBoolean("UPDATE_TEST_ORACLE");
 
 
     static {
@@ -99,13 +102,13 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * Number of executed SET nodes to execute all in one.
      */
     public static final int ALL_IN_ONE_RUN =
-        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
 
     /**
      * Number of executed SET nodes for only one SET node per auto mode run.
      */
     public static final int SINGLE_SET_NODE_RUN =
-        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
 
     /**
      * Default stop conditions of executed SET nodes.
@@ -132,9 +135,9 @@ public abstract class AbstractSymbolicExecutionTestCase {
     static {
         // Define fast mode
         if (FAST_MODE) {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN };
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN};
         } else {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN };
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN};
         }
         // Create temporary director for oracle files if required.
         File directory = null;
@@ -157,18 +160,18 @@ public abstract class AbstractSymbolicExecutionTestCase {
     /**
      * Creates a new oracle file.
      *
-     * @param node The node to save as oracle file.
+     * @param node                    The node to save as oracle file.
      * @param oraclePathInBaseDirFile The path in example directory.
-     * @param saveConstraints Save constraints?
-     * @param saveVariables Save variables?
-     * @param saveCallStack Save call stack?
-     * @param saveReturnValues Save method return values?
-     * @throws IOException Occurred Exception
+     * @param saveConstraints         Save constraints?
+     * @param saveVariables           Save variables?
+     * @param saveCallStack           Save call stack?
+     * @param saveReturnValues        Save method return values?
+     * @throws IOException         Occurred Exception
      * @throws ProofInputException Occurred Exception
      */
     protected static void createOracleFile(IExecutionNode<?> node, String oraclePathInBaseDirFile,
-            boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
-            boolean saveReturnValues) throws IOException, ProofInputException {
+                                           boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
+                                           boolean saveReturnValues) throws IOException, ProofInputException {
         if (tempNewOracleDirectory != null && tempNewOracleDirectory.isDirectory()) {
             // Create sub folder structure
             File oracleFile = new File(tempNewOracleDirectory, oraclePathInBaseDirFile);
@@ -176,7 +179,7 @@ protected static void createOracleFile(IExecutionNode<?> node, String oraclePath
             // Create oracle file
             ExecutionNodeWriter writer = new ExecutionNodeWriter();
             writer.write(node, ExecutionNodeWriter.DEFAULT_ENCODING, oracleFile, saveVariables,
-                saveCallStack, saveReturnValues, saveConstraints);
+                    saveCallStack, saveReturnValues, saveConstraints);
             // Print message to the user.
             printOracleDirectory();
         }
@@ -204,37 +207,37 @@ protected static void printOracleDirectory() {
     /**
      * Makes sure that the given nodes and their subtrees contains the same content.
      *
-     * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
-     * @param compareVariables Compare variables?
-     * @param compareCallStack Compare call stack?
-     * @param compareChildOrder Is the order of children relevant?
+     * @param expected            The expected {@link IExecutionNode}.
+     * @param current             The current {@link IExecutionNode}.
+     * @param compareVariables    Compare variables?
+     * @param compareCallStack    Compare call stack?
+     * @param compareChildOrder   Is the order of children relevant?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints Compare constraints?
+     * @param compareConstraints  Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
-            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+                                            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
+                                            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         if (compareChildOrder) {
             // Order of children must be the same.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(expected);
+                    new ExecutionNodePreorderIterator(expected);
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(current);
+                    new ExecutionNodePreorderIterator(current);
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                    compareCallStack, compareReturnValues, compareConstraints);
+                        compareCallStack, compareReturnValues, compareConstraints);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             // Order of children is not relevant.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(expected);
+                    new ExecutionNodePreorderIterator(expected);
             Set<IExecutionNode<?>> currentVisitedNodes = new LinkedHashSet<>();
             while (expectedExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
@@ -243,11 +246,11 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
                     fail("Node " + currentNext + " visited twice.");
                 }
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                    compareCallStack, compareReturnValues, compareConstraints);
+                        compareCallStack, compareReturnValues, compareConstraints);
             }
             // Make sure that each current node was visited
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                new ExecutionNodePreorderIterator(current);
+                    new ExecutionNodePreorderIterator(current);
             while (actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 if (!currentVisitedNodes.remove(currentNext)) {
@@ -261,13 +264,13 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
     /**
      * Searches the direct or indirect child in subtree of the node to search in.
      *
-     * @param toSearchIn The node to search in.
+     * @param toSearchIn    The node to search in.
      * @param childToSearch The node to search.
      * @return The found node.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearchIn,
-            IExecutionNode<?> childToSearch) throws ProofInputException {
+                                                           IExecutionNode<?> childToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(toSearchIn);
         assertNotNull(childToSearch);
@@ -288,20 +291,20 @@ protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearc
             }
         }
         assertNotNull(toSearchIn, "Direct or indirect Child " + childToSearch
-            + " is not contained in " + toSearchIn + ".");
+                + " is not contained in " + toSearchIn + ".");
         return toSearchIn;
     }
 
     /**
      * Searches the direct child. Nodes are equal if the name and the element type is equal.
      *
-     * @param parentToSearchIn The parent to search in its children.
+     * @param parentToSearchIn    The parent to search in its children.
      * @param directChildToSearch The child to search.
      * @return The found child.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> parentToSearchIn,
-            IExecutionNode<?> directChildToSearch) throws ProofInputException {
+                                                             IExecutionNode<?> directChildToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(parentToSearchIn);
         assertNotNull(directChildToSearch);
@@ -315,60 +318,60 @@ protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> paren
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
-                            ((IExecutionBranchCondition) directChildToSearch)
-                                    .getAdditionalBranchLabel())
+                        ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
+                        ((IExecutionBranchCondition) directChildToSearch)
+                                .getAdditionalBranchLabel())
                         && children[i].getElementType()
-                                .equals(directChildToSearch.getElementType())) {
+                        .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             } else {
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && children[i].getElementType()
-                                .equals(directChildToSearch.getElementType())) {
+                        .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             }
             i++;
         }
         assertNotNull(result,
-            "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
+                "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
         return result;
     }
 
     /**
      * Makes sure that the given nodes contains the same content. Children are not compared.
      *
-     * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
-     * @param compareParent Compare also the parent node?
-     * @param compareVariables Compare variables?
-     * @param compareCallStack Compare call stack?
+     * @param expected            The expected {@link IExecutionNode}.
+     * @param current             The current {@link IExecutionNode}.
+     * @param compareParent       Compare also the parent node?
+     * @param compareVariables    Compare variables?
+     * @param compareCallStack    Compare call stack?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints Compare constraints?
+     * @param compareConstraints  Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertExecutionNode(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareParent, boolean compareVariables, boolean compareCallStack,
-            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+                                              boolean compareParent, boolean compareVariables, boolean compareCallStack,
+                                              boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         // Compare nodes
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-            "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
+                "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
         assertEquals(expected.isPathConditionChanged(), current.isPathConditionChanged());
         if (!StringUtil.equalIgnoreWhiteSpace(expected.getFormatedPathCondition(),
-            current.getFormatedPathCondition())) {
+                current.getFormatedPathCondition())) {
             assertEquals(expected.getFormatedPathCondition(), current.getFormatedPathCondition());
         }
         if (compareParent) {
             if (expected instanceof IExecutionBlockStartNode<?>) {
                 assertTrue(current instanceof IExecutionBlockStartNode<?>);
                 assertEquals(((IExecutionBlockStartNode<?>) expected).isBlockOpened(),
-                    ((IExecutionBlockStartNode<?>) current).isBlockOpened());
+                        ((IExecutionBlockStartNode<?>) current).isBlockOpened());
                 assertBlockCompletions((IExecutionBlockStartNode<?>) expected,
-                    (IExecutionBlockStartNode<?>) current);
+                        (IExecutionBlockStartNode<?>) current);
             }
             assertCompletedBlocks(expected, current);
             assertOutgoingLinks(expected, current);
@@ -377,177 +380,177 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
         if (expected instanceof IExecutionBaseMethodReturn<?>) {
             assertTrue(current instanceof IExecutionBaseMethodReturn<?>);
             assertCallStateVariables((IExecutionBaseMethodReturn<?>) expected,
-                (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
+                    (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
         }
         if (expected instanceof IExecutionBranchCondition) {
             assertTrue(current instanceof IExecutionBranchCondition,
-                "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
+                    "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
-                    ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
-                "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
-                    + "\" but is \""
-                    + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
+                            ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
+                    "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
+                            + "\" but is \""
+                            + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
             assertEquals(((IExecutionBranchCondition) expected).isMergedBranchCondition(),
-                ((IExecutionBranchCondition) current).isMergedBranchCondition());
+                    ((IExecutionBranchCondition) current).isMergedBranchCondition());
             assertEquals(((IExecutionBranchCondition) expected).isBranchConditionComputed(),
-                ((IExecutionBranchCondition) current).isBranchConditionComputed());
+                    ((IExecutionBranchCondition) current).isBranchConditionComputed());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
-                    ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
-                "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
-                    + "\" but is \""
-                    + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
+                            ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
+                    "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
+                            + "\" but is \""
+                            + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStart) {
             assertTrue(current instanceof IExecutionStart, "Expected IExecutionStartNode but is "
-                + current.getClass() + ".");
+                    + current.getClass() + ".");
             assertTerminations((IExecutionStart) expected, (IExecutionStart) current);
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionTermination) {
             assertTrue(current instanceof IExecutionTermination,
-                "Expected IExecutionTermination but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionTermination but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionTermination) expected).getTerminationKind(),
-                ((IExecutionTermination) current).getTerminationKind());
+                    ((IExecutionTermination) current).getTerminationKind());
             assertEquals(((IExecutionTermination) expected).isBranchVerified(),
-                ((IExecutionTermination) current).isBranchVerified());
+                    ((IExecutionTermination) current).isBranchVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionBranchStatement) {
             assertTrue(current instanceof IExecutionBranchStatement,
-                "Expected IExecutionBranchStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionBranchStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopCondition) {
             assertTrue(current instanceof IExecutionLoopCondition,
-                "Expected IExecutionLoopCondition but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopCondition but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopStatement) {
             assertTrue(current instanceof IExecutionLoopStatement,
-                "Expected IExecutionLoopStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionMethodCall) {
             assertTrue(current instanceof IExecutionMethodCall,
-                "Expected IExecutionMethodCall but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionMethodCall but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             assertMethodReturns((IExecutionMethodCall) expected, (IExecutionMethodCall) current);
         } else if (expected instanceof IExecutionMethodReturn) {
             assertTrue(current instanceof IExecutionMethodReturn,
-                "Expected IExecutionMethodReturn but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionMethodReturn but is "
+                            + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
-                    ((IExecutionMethodReturn) current).getSignature()),
-                ((IExecutionMethodReturn) expected).getSignature() + " does not match "
-                    + ((IExecutionMethodReturn) current).getSignature());
+                    StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
+                            ((IExecutionMethodReturn) current).getSignature()),
+                    ((IExecutionMethodReturn) expected).getSignature() + " does not match "
+                            + ((IExecutionMethodReturn) current).getSignature());
             if (compareReturnValues) {
                 assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
-                        ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
-                    ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
-                        + " does not match "
-                        + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
+                        StringUtil.equalIgnoreWhiteSpace(
+                                ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
+                                ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
+                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
+                                + " does not match "
+                                + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
                 assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
-                        ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
-                    ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
-                        + " does not match "
-                        + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
+                        StringUtil.equalIgnoreWhiteSpace(
+                                ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
+                                ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
+                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
+                                + " does not match "
+                                + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
                 assertEquals(((IExecutionMethodReturn) expected).isReturnValuesComputed(),
-                    ((IExecutionMethodReturn) current).isReturnValuesComputed());
+                        ((IExecutionMethodReturn) current).isReturnValuesComputed());
             }
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
+                    StringUtil.equalIgnoreWhiteSpace(
                     ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition(),
                     ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition()
-                    + " does not match "
+                            + " does not match "
                     + ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             if (compareReturnValues) {
                 assertReturnValues(((IExecutionMethodReturn) expected).getReturnValues(),
-                    ((IExecutionMethodReturn) current).getReturnValues());
+                        ((IExecutionMethodReturn) current).getReturnValues());
             }
         } else if (expected instanceof IExecutionExceptionalMethodReturn) {
             assertTrue(current instanceof IExecutionExceptionalMethodReturn,
-                "Expected IExecutionExceptionalMethodReturn but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionExceptionalMethodReturn but is "
+                            + current.getClass() + ".");
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(
-                    ((IExecutionExceptionalMethodReturn) expected).getSignature(),
-                    ((IExecutionExceptionalMethodReturn) current).getSignature()),
-                ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
-                    + ((IExecutionExceptionalMethodReturn) current).getSignature());
+                    StringUtil.equalIgnoreWhiteSpace(
+                            ((IExecutionExceptionalMethodReturn) expected).getSignature(),
+                            ((IExecutionExceptionalMethodReturn) current).getSignature()),
+                    ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
+                            + ((IExecutionExceptionalMethodReturn) current).getSignature());
             assertTrue(StringUtil.equalIgnoreWhiteSpace(
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition(),
                 ((IExecutionExceptionalMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition()
-                    + " does not match " + ((IExecutionExceptionalMethodReturn) current)
+                            + " does not match " + ((IExecutionExceptionalMethodReturn) current)
                             .getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStatement) {
             assertTrue(current instanceof IExecutionStatement,
-                "Expected IExecutionStatement but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionStatement but is "
+                            + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionOperationContract) {
             assertTrue(current instanceof IExecutionOperationContract,
-                "Expected IExecutionOperationContract but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionOperationContract but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionOperationContract) expected).isPreconditionComplied(),
-                ((IExecutionOperationContract) current).isPreconditionComplied());
+                    ((IExecutionOperationContract) current).isPreconditionComplied());
             assertEquals(((IExecutionOperationContract) expected).hasNotNullCheck(),
-                ((IExecutionOperationContract) current).hasNotNullCheck());
+                    ((IExecutionOperationContract) current).hasNotNullCheck());
             assertEquals(((IExecutionOperationContract) expected).isNotNullCheckComplied(),
-                ((IExecutionOperationContract) current).isNotNullCheckComplied());
+                    ((IExecutionOperationContract) current).isNotNullCheckComplied());
             assertEquals(((IExecutionOperationContract) expected).getFormatedResultTerm(),
-                ((IExecutionOperationContract) current).getFormatedResultTerm());
+                    ((IExecutionOperationContract) current).getFormatedResultTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedExceptionTerm(),
-                ((IExecutionOperationContract) current).getFormatedExceptionTerm());
+                    ((IExecutionOperationContract) current).getFormatedExceptionTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedSelfTerm(),
-                ((IExecutionOperationContract) current).getFormatedSelfTerm());
+                    ((IExecutionOperationContract) current).getFormatedSelfTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedContractParams(),
-                ((IExecutionOperationContract) current).getFormatedContractParams());
+                    ((IExecutionOperationContract) current).getFormatedContractParams());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopInvariant) {
             assertTrue(current instanceof IExecutionLoopInvariant,
-                "Expected IExecutionLoopInvariant but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionLoopInvariant but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionLoopInvariant) expected).isInitiallyValid(),
-                ((IExecutionLoopInvariant) current).isInitiallyValid());
+                    ((IExecutionLoopInvariant) current).isInitiallyValid());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionAuxiliaryContract) {
             assertTrue(current instanceof IExecutionAuxiliaryContract,
-                "Expected IExecutionBlockContract but is "
-                    + current.getClass() + ".");
+                    "Expected IExecutionBlockContract but is "
+                            + current.getClass() + ".");
             assertEquals(((IExecutionAuxiliaryContract) expected).isPreconditionComplied(),
-                ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
+                    ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionJoin) {
             assertTrue(current instanceof IExecutionJoin, "Expected IExecutionJoin but is "
-                + current.getClass() + ".");
+                    + current.getClass() + ".");
             assertEquals(((IExecutionJoin) expected).isWeakeningVerified(),
-                ((IExecutionJoin) current).isWeakeningVerified());
+                    ((IExecutionJoin) current).isWeakeningVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else {
@@ -559,22 +562,22 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
             IExecutionNode<?>[] currentStack = current.getCallStack();
             if (expectedStack != null) {
                 assertNotNull(currentStack,
-                    "Call stack of \"" + current + "\" should not be null.");
+                        "Call stack of \"" + current + "\" should not be null.");
                 assertEquals(expectedStack.length, currentStack.length, "Node: " + expected);
                 for (int i = 0; i < expectedStack.length; i++) {
                     assertExecutionNode(expectedStack[i], currentStack[i], false, false, false,
-                        false, false);
+                            false, false);
                 }
             } else {
                 assertTrue(currentStack == null || currentStack.length == 0,
-                    "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
-                        + "\" but should be null or empty.");
+                        "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
+                                + "\" but should be null or empty.");
             }
         }
         // Optionally compare parent
         if (compareParent) {
             assertExecutionNode(expected, current, false, compareVariables, compareCallStack,
-                compareReturnValues, compareConstraints);
+                    compareReturnValues, compareConstraints);
         }
     }
 
@@ -582,7 +585,7 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
      * Compares the outgoing links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -591,9 +594,9 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getOutgoingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Outgoing links of \"" + current + "\" should not be null.");
+                    "Outgoing links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                "Outgoing links: " + expected);
+                    "Outgoing links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -601,15 +604,15 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                    false, false, false);
+                        false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                    false, false, false);
+                        false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Outgoing links of \""
-                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -617,7 +620,7 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
      * Compares the incoming links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -626,9 +629,9 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getIncomingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Incoming links of \"" + current + "\" should not be null.");
+                    "Incoming links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                "Incoming links: " + expected);
+                    "Incoming links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -636,15 +639,15 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                    false, false, false);
+                        false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                    false, false, false);
+                        false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Incoming links of \""
-                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -652,29 +655,29 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
      * Compares the completed blocks.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current The current {@link IExecutionNode}.
+     * @param current  The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCompletedBlocks(IExecutionNode<?> expected,
-            IExecutionNode<?> current) throws ProofInputException {
+                                                IExecutionNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionBlockStartNode<?>> expectedEntries = expected.getCompletedBlocks();
         ImmutableList<IExecutionBlockStartNode<?>> currentEntries = current.getCompletedBlocks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Completed blocks of \"" + current + "\" should not be null.");
+                    "Completed blocks of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBlockStartNode<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionBlockStartNode<?>> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionBlockStartNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionBlockStartNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, false, false,
-                    false, false, false);
+                        false, false, false);
                 String expectedCondition =
-                    expected.getFormatedBlockCompletionCondition(expectedNext);
+                        expected.getFormatedBlockCompletionCondition(expectedNext);
                 String currentCondition = current.getFormatedBlockCompletionCondition(currentNext);
                 if (!StringUtil.equalIgnoreWhiteSpace(expectedCondition, currentCondition)) {
                     assertEquals(expectedCondition, currentCondition);
@@ -684,8 +687,8 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Completed block entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Completed block entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -693,33 +696,33 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
      * Compares the block completions.
      *
      * @param expected The expected {@link IExecutionBlockStartNode}.
-     * @param current The current {@link IExecutionBlockStartNode}.
+     * @param current  The current {@link IExecutionBlockStartNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expected,
-            IExecutionBlockStartNode<?> current) throws ProofInputException {
+                                                 IExecutionBlockStartNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionNode<?>> expectedEntries = expected.getBlockCompletions();
         ImmutableList<IExecutionNode<?>> currentEntries = current.getBlockCompletions();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Block completions of \"" + current + "\" should not be null.");
+                    "Block completions of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionNode<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionNode<?>> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Block completion entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Block completion entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -727,34 +730,34 @@ protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expecte
      * Compares the method returns.
      *
      * @param expected The expected {@link IExecutionMethodCall}.
-     * @param current The current {@link IExecutionMethodCall}.
+     * @param current  The current {@link IExecutionMethodCall}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertMethodReturns(IExecutionMethodCall expected,
-            IExecutionMethodCall current) throws ProofInputException {
+                                              IExecutionMethodCall current) throws ProofInputException {
         ImmutableList<IExecutionBaseMethodReturn<?>> expectedEntries = expected.getMethodReturns();
         ImmutableList<IExecutionBaseMethodReturn<?>> currentEntries = current.getMethodReturns();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                "Method return of \"" + current + "\" should not be null.");
+                    "Method return of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBaseMethodReturn<?>> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionBaseMethodReturn<?>> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Method return entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Method return entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -762,7 +765,7 @@ protected static void assertMethodReturns(IExecutionMethodCall expected,
      * Compares the terminations.
      *
      * @param expected The expected {@link IExecutionStart}.
-     * @param current The current {@link IExecutionStart}.
+     * @param current  The current {@link IExecutionStart}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertTerminations(IExecutionStart expected, IExecutionStart current)
@@ -773,22 +776,22 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
             assertNotNull(currentEntries, "Termination of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionTermination> expectedExecutionTreeNodeIterator =
-                expectedEntries.iterator();
+                    expectedEntries.iterator();
             Iterator<IExecutionTermination> actualExecutionTreeNodeIterator =
-                currentEntries.iterator();
+                    currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                    actualExecutionTreeNodeIterator.next(),
-                    false, false, false,
-                    false, false);
+                        actualExecutionTreeNodeIterator.next(),
+                        false, false, false,
+                        false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                "Termination entries of \"" + current + "\" is \"" + currentEntries
-                    + "\" but should be null or empty.");
+                    "Termination entries of \"" + current + "\" is \"" + currentEntries
+                            + "\" but should be null or empty.");
         }
     }
 
@@ -796,11 +799,11 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
      * Makes sure that the given nodes contains the same {@link IExecutionMethodReturnValue}s.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}s.
-     * @param current The current {@link IExecutionMethodReturnValue}s.
+     * @param current  The current {@link IExecutionMethodReturnValue}s.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
-            IExecutionMethodReturnValue[] current) throws ProofInputException {
+                                             IExecutionMethodReturnValue[] current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertEquals(expected.length, current.length);
@@ -813,36 +816,36 @@ protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
      * Makes sure that the given {@link IExecutionMethodReturnValue}s are the same.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}.
-     * @param current The current {@link IExecutionMethodReturnValue}.
+     * @param current  The current {@link IExecutionMethodReturnValue}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValue(IExecutionMethodReturnValue expected,
-            IExecutionMethodReturnValue current) throws ProofInputException {
+                                            IExecutionMethodReturnValue current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-            expected.getName() + " does not match " + current.getName());
+                expected.getName() + " does not match " + current.getName());
         assertTrue(
-            StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
-                current.getReturnValueString()),
-            expected.getReturnValueString() + " does not match " + current.getReturnValueString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
+                        current.getReturnValueString()),
+                expected.getReturnValueString() + " does not match " + current.getReturnValueString());
         assertEquals(expected.hasCondition(), current.hasCondition());
         assertTrue(
-            StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                current.getConditionString()),
-            expected.getConditionString() + " does not match " + current.getConditionString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                        current.getConditionString()),
+                expected.getConditionString() + " does not match " + current.getConditionString());
     }
 
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionNode}s.
      *
-     * @param expected The expected node.
-     * @param current The current node.
+     * @param expected           The expected node.
+     * @param current            The current node.
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareConstraints) throws ProofInputException {
+                                            boolean compareConstraints) throws ProofInputException {
         if (compareConstraints) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -856,26 +859,26 @@ protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNo
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraints.
-     * @param current The current constraints.
+     * @param current  The current constraints.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionConstraint[] expected,
-            IExecutionConstraint[] current) throws ProofInputException {
+                                            IExecutionConstraint[] current) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionConstraint> availableCurrentVariables =
-            new ArrayList<>(Arrays.asList(current));
+                new ArrayList<>(Arrays.asList(current));
         for (final IExecutionConstraint expectedVariable : expected) {
             // Find current variable with same name
             IExecutionConstraint currentVariable = CollectionUtil.searchAndRemove(
-                availableCurrentVariables, element -> {
-                    try {
-                        return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                            element.getName());
-                    } catch (ProofInputException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
+                    availableCurrentVariables, element -> {
+                        try {
+                            return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
+                                    element.getName());
+                        } catch (ProofInputException e) {
+                            throw new RuntimeException(e);
+                        }
+                    });
             assertNotNull(currentVariable);
             // Compare variables
             assertConstraint(expectedVariable, currentVariable);
@@ -887,11 +890,11 @@ protected static void assertConstraints(IExecutionConstraint[] expected,
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraint.
-     * @param current The current constraint.
+     * @param current  The current constraint.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraint(IExecutionConstraint expected,
-            IExecutionConstraint current) throws ProofInputException {
+                                           IExecutionConstraint current) throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             if (!StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName())) {
@@ -906,15 +909,15 @@ protected static void assertConstraint(IExecutionConstraint expected,
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s of the call
      * state.
      *
-     * @param expected The expected node.
-     * @param current The current node.
-     * @param compareVariables Compare variables?
+     * @param expected           The expected node.
+     * @param current            The current node.
+     * @param compareVariables   Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> expected,
-            IExecutionBaseMethodReturn<?> current, boolean compareVariables,
-            boolean compareConstraints) throws ProofInputException {
+                                                   IExecutionBaseMethodReturn<?> current, boolean compareVariables,
+                                                   boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -927,14 +930,14 @@ protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> exp
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s.
      *
-     * @param expected The expected node.
-     * @param current The current node.
-     * @param compareVariables Compare variables?
+     * @param expected           The expected node.
+     * @param current            The current node.
+     * @param compareVariables   Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode<?> current,
-            boolean compareVariables, boolean compareConstraints) throws ProofInputException {
+                                          boolean compareVariables, boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -947,27 +950,27 @@ protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected The expected variables.
-     * @param current The current variables.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variables.
+     * @param current            The current variables.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionVariable[] expected,
-            IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
-            boolean compareConstraints) throws ProofInputException {
+                                          IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
+                                          boolean compareConstraints) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionVariable> availableCurrentVariables =
-            new ArrayList<>(Arrays.asList(current));
+                new ArrayList<>(Arrays.asList(current));
         for (final IExecutionVariable expectedVariable : expected) {
             // Find current variable with same name
             IExecutionVariable currentVariable = CollectionUtil
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                element.getName());
+                                    element.getName());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -975,7 +978,7 @@ protected static void assertVariables(IExecutionVariable[] expected,
             assertNotNull(currentVariable);
             // Compare variables
             assertVariable(expectedVariable, currentVariable, compareParent, compareChildren,
-                compareConstraints);
+                    compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -983,15 +986,15 @@ protected static void assertVariables(IExecutionVariable[] expected,
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected The expected variable.
-     * @param current The current variable.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variable.
+     * @param current            The current variable.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariable(IExecutionVariable expected, IExecutionVariable current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                         boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
@@ -1002,7 +1005,7 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
             // Compare parent
             if (compareParent) {
                 assertValue(expected.getParentValue(), current.getParentValue(), false, false,
-                    false);
+                        false);
             }
             // Compare children
             if (compareChildren) {
@@ -1018,15 +1021,15 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected The expected values.
-     * @param current The current values.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected values.
+     * @param current            The current values.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValues(IExecutionValue[] expected, IExecutionValue[] current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                       boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
@@ -1037,10 +1040,10 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                element.getName())
+                                    element.getName())
                                     && StringUtil.equalIgnoreWhiteSpace(
-                                        expectedVariable.getConditionString(),
-                                        element.getConditionString());
+                                    expectedVariable.getConditionString(),
+                                    element.getConditionString());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -1048,7 +1051,7 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
             assertNotNull(currentVariable);
             // Compare variables
             assertValue(expectedVariable, currentVariable, compareParent, compareChildren,
-                compareConstraints);
+                    compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -1056,43 +1059,43 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected The expected variable.
-     * @param current The current variable.
-     * @param compareParent Compare parent?
-     * @param compareChildren Compare children?
+     * @param expected           The expected variable.
+     * @param current            The current variable.
+     * @param compareParent      Compare parent?
+     * @param compareChildren    Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValue(IExecutionValue expected, IExecutionValue current,
-            boolean compareParent, boolean compareChildren, boolean compareConstraints)
+                                      boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             // Compare variable
             assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                expected.getName() + " does not match " + current.getName());
+                    expected.getName() + " does not match " + current.getName());
             assertEquals(expected.getTypeString(), current.getTypeString());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
-                    current.getValueString()),
-                expected.getValueString() + " does not match " + current.getValueString());
+                    StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
+                            current.getValueString()),
+                    expected.getValueString() + " does not match " + current.getValueString());
             assertEquals(expected.isValueAnObject(), current.isValueAnObject());
             assertEquals(expected.isValueUnknown(), current.isValueUnknown());
             assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                    current.getConditionString()),
-                expected.getConditionString() + " does not match " + current.getConditionString());
+                    StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                            current.getConditionString()),
+                    expected.getConditionString() + " does not match " + current.getConditionString());
             // Compare parent
             if (compareParent) {
                 assertVariable(expected.getVariable(), current.getVariable(), false, false,
-                    compareConstraints);
+                        compareConstraints);
             }
             // Compare children
             if (compareChildren) {
                 IExecutionVariable[] expectedChildVariables = expected.getChildVariables();
                 IExecutionVariable[] currentChildVariables = current.getChildVariables();
                 assertVariables(expectedChildVariables, currentChildVariables, compareParent,
-                    compareChildren, compareConstraints);
+                        compareChildren, compareConstraints);
             }
             // Compare constraints
             if (compareConstraints) {
@@ -1109,37 +1112,41 @@ protected static void assertValue(IExecutionValue expected, IExecutionValue curr
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepReturn(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                     SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                     String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -1147,164 +1154,182 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
+                                                    SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                                    String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         stopCondition.addChildren(lineBreakpoints);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            // Run proof
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step over" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void stepOver(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                   SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                   String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepOverSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
+        try {
+            // Run proof
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
      * @return The found {@link SymbolicExecutionCompletions}.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-            String oracleFileExtension, File baseDir)
+                                                           SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+                                                           String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        SymbolicExecutionCompletions completions = builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-            baseDir);
-        return completions;
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+
+            // Update symbolic execution tree
+            SymbolicExecutionCompletions completions = builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+                    baseDir);
+            return completions;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui The {@link DefaultUserInterfaceControl} to use.
-     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
+     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void resume(DefaultUserInterfaceControl ui,
-            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
+                                 SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        ui.getProofControl().startAndWaitForAutoMode(proof);
-        // Update symbolic execution tree
-        builder.analyse();
-        // Test result
-        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
+        try {
+            ui.getProofControl().startAndWaitForAutoMode(proof);
+
+            // Update symbolic execution tree
+            builder.analyse();
+            // Test result
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-            String oraclePathInBaseDirFile, File baseDir)
+                                                 String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         if (CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
             createOracleFile(builder.getStartNode(), oraclePathInBaseDirFile, false, false, false,
-                false);
+                    false);
         } else {
             // Read oracle file
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
@@ -1313,41 +1338,41 @@ protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builde
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, builder.getStartNode(), false, false, false, false,
-                false);
+                    false);
         }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex The index of the current step.
-     * @param oracleFileExtension The oracle file extension
-     * @param baseDir The base directory for oracles.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param oracleIndex             The index of the current step.
+     * @param oracleFileExtension     The oracle file extension
+     * @param baseDir                 The base directory for oracles.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
+     * @throws SAXException                 Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-            String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
-            File baseDir)
+                                                 String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
+                                                 File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         assertSetTreeAfterStep(builder,
-            oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
+                oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
     }
 
     /**
      * Searches a {@link IProgramMethod} in the given {@link Services}.
      *
-     * @param services The {@link Services} to search in.
+     * @param services          The {@link Services} to search in.
      * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
+     * @param methodFullName    The method name to search.
      * @return The first found {@link IProgramMethod} in the type.
      */
     public static IProgramMethod searchProgramMethod(Services services, String containerTypeName,
-            final String methodFullName) {
+                                                     final String methodFullName) {
         return HelperClassForTests.searchProgramMethod(services, containerTypeName, methodFullName);
     }
 
@@ -1356,29 +1381,29 @@ public static IProgramMethod searchProgramMethod(Services services, String conta
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param baseContractName The name of the contract.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param baseContractName                    The name of the contract.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String baseContractName,
@@ -1392,26 +1417,26 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
-            null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
+                null, null, null, true);
         setupTacletOptions(environment);
         // Start proof
         final Contract contract = environment.getServices().getSpecificationRepository()
                 .getContractByName(baseContractName);
         assertTrue(contract instanceof FunctionalOperationContract);
         ProofOblInput input = new FunctionalOperationContractPO(environment.getInitConfig(),
-            (FunctionalOperationContract) contract, true, true);
+                (FunctionalOperationContract) contract, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1423,30 +1448,30 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
-     * @param precondition An optional precondition to use.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The name of the type which contains the method.
+     * @param methodFullName                      The method name to search.
+     * @param precondition                        An optional precondition to use.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1460,25 +1485,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodPO(environment.getInitConfig(), pm.getFullName(), pm,
-            precondition, true, true);
+                precondition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1501,26 +1526,26 @@ private static void setupTacletOptions(KeYEnvironment<?> env) {
      * Creates a {@link SymbolicExecutionEnvironment} which consists of loading a proof file to load
      * and creation with configuration of {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofPathInBaseDir The path to the proof file inside the base directory.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofPathInBaseDir                  The path to the proof file inside the base directory.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
      */
@@ -1537,20 +1562,20 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(proofFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
-            null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
+                null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
         setupTacletOptions(environment);
         Proof proof = environment.getLoadedProof();
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1562,32 +1587,32 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName The method name to search.
-     * @param precondition An optional precondition to use.
-     * @param startPosition The start position.
-     * @param endPosition The end position.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The name of the type which contains the method.
+     * @param methodFullName                      The method name to search.
+     * @param precondition                        An optional precondition to use.
+     * @param startPosition                       The start position.
+     * @param endPosition                         The end position.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1602,25 +1627,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodSubsetPO(environment.getInitConfig(), methodFullName,
-            pm, precondition, startPosition, endPosition, true, true);
+                pm, precondition, startPosition, endPosition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-            useOperationContracts, useLoopInvariants, blockTreatmentContract,
-            nonExecutionBranchHidingSideProofs, aliasChecks);
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1645,7 +1670,7 @@ protected String getTryContent(Proof proof) {
         JavaProgramElement updateContent = updateApplication.subs().get(1).javaBlock().program();
         assertTrue(updateContent instanceof StatementBlock);
         ImmutableArray<? extends Statement> updateContentBody =
-            ((StatementBlock) updateContent).getBody();
+                ((StatementBlock) updateContent).getBody();
         assertEquals(2, updateContentBody.size());
         assertTrue(updateContentBody.get(1) instanceof Try);
         Try tryStatement = (Try) updateContentBody.get(1);
@@ -1656,39 +1681,39 @@ protected String getTryContent(Proof proof) {
     /**
      * Makes sure that the save and loading process works.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param baseDir                 The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir       The path to the java file inside the base directory.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param env The already executed {@link SymbolicExecutionEnvironment} which contains the proof
-     *        to save/load.
-     * @throws IOException Occurred Exception
-     * @throws ProofInputException Occurred Exception
+     * @param env                     The already executed {@link SymbolicExecutionEnvironment} which contains the proof
+     *                                to save/load.
+     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException          Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
-            String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
+                                       String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         File javaFile = new File(baseDir, javaPathInBaseDir);
         assertTrue(javaFile.exists());
         File tempFile =
-            File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
+                File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
         KeYEnvironment<DefaultUserInterfaceControl> reloadedEnv = null;
         SymbolicExecutionTreeBuilder reloadedBuilder = null;
         try {
             ProofSaver saver = new ProofSaver(env.getProof(), tempFile.getAbsolutePath(),
-                KeYConstants.INTERNAL_VERSION);
+                    KeYConstants.INTERNAL_VERSION);
             assertNull(saver.save());
             // Load proof from saved *.proof file
             reloadedEnv = KeYEnvironment.load(SymbolicExecutionJavaProfile.getDefaultInstance(),
-                tempFile, null, null, null, true);
+                    tempFile, null, null, null, true);
             Proof reloadedProof = reloadedEnv.getLoadedProof();
             assertNotSame(env.getProof(), reloadedProof);
             // Recreate symbolic execution tree
             reloadedBuilder =
-                new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
+                    new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
             SymbolicExecutionUtil.initializeStrategy(reloadedBuilder);
             reloadedBuilder.analyse();
             assertSetTreeAfterStep(reloadedBuilder, oraclePathInBaseDirFile, baseDir);
@@ -1717,59 +1742,59 @@ protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
+     * @param baseDir                               The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                     The path to the java file inside the base directory.
+     * @param containerTypeName                     The java class to test.
+     * @param methodFullName                        The method to test.
+     * @param precondition                          An optional precondition.
+     * @param oraclePathInBaseDirFile               The path to the oracle file inside the base directory.
+     * @param includeConstraints                    Include constraints?
+     * @param includeVariables                      Include variables?
+     * @param includeCallStack                      Include call stack?
+     * @param includeReturnValues                   Include method return values?
      * @param maximalNumberOfExecutedSetNodesPerRun The number of executed set nodes per auto mode
-     *        run. The whole test is executed for each defined value.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
-     * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                              run. The whole test is executed for each defined value.
+     * @param mergeBranchConditions                 Merge branch conditions?
+     * @param useOperationContracts                 Use operation contracts?
+     * @param useLoopInvariants                     Use loop invariants?
+     * @param blockTreatmentContract                Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs    {@code true} hide non execution branch labels by
+     *                                              side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                           Do alias checks?
+     * @param useUnicode                            {@code true} use unicode characters, {@code false} do not use unicode
+     *                                              characters.
+     * @param usePrettyPrinting                     {@code true} use pretty printing, {@code false} do not use pretty
+     *                                              printing.
+     * @param variablesAreOnlyComputedFromUpdates   {@code true} {@link IExecutionVariable} are only
+     *                                              computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                              according to the type structure of the visible memory.
+     * @param simplifyConditions                    {@code true} simplify conditions, {@code false} do not simplify
+     *                                              conditions.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTest(File baseDir, String javaPathInBaseDir, String containerTypeName,
-            String methodFullName, String precondition, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
-            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                             String methodFullName, String precondition, String oraclePathInBaseDirFile,
+                             boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                             boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
+                             boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+                             boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                             boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                             boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         assertNotNull(maximalNumberOfExecutedSetNodesPerRun);
         for (int j : maximalNumberOfExecutedSetNodesPerRun) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env = doSETTest(baseDir,
-                javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                includeReturnValues, j,
-                mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                    javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                    oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                    includeReturnValues, j,
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
             env.dispose();
         }
     }
@@ -1778,57 +1803,57 @@ protected void doSETTest(File baseDir, String javaPathInBaseDir, String containe
      * Executes method <code>doTest</code>
      * and disposes the created {@link SymbolicExecutionEnvironment}.
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The java class to test.
+     * @param methodFullName                      The method to test.
+     * @param precondition                        An optional precondition.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
-            String containerTypeName, String methodFullName, String precondition,
-            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-            boolean includeCallStack, boolean includeReturnValues,
-            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                                       String containerTypeName, String methodFullName, String precondition,
+                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+                                       boolean includeCallStack, boolean includeReturnValues,
+                                       int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+                                       boolean useOperationContracts, boolean useLoopInvariants,
+                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                       boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-            doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                        oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                        includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
+                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                        variablesAreOnlyComputedFromUpdates, simplifyConditions);
         env.dispose();
     }
 
@@ -1845,47 +1870,47 @@ protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
-            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-            boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
+                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+                                       boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
+                                       boolean useOperationContracts, boolean useLoopInvariants,
+                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                       boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-            doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
-                includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                variablesAreOnlyComputedFromUpdates, false, true);
+                doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
+                        includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
+                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                        variablesAreOnlyComputedFromUpdates, false, true);
         if (env != null) {
             env.dispose();
         }
@@ -1904,47 +1929,47 @@ protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-            boolean simplifyConditions) throws ProofInputException, IOException,
+                                                                                  String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
+                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                                                                  boolean includeReturnValues, boolean mergeBranchConditions,
+                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         boolean originalOneStepSimplification = isOneStepSimplificationEnabled(null);
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env;
@@ -1955,26 +1980,26 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             // Make sure that the correct taclet options are defined.
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             env = createSymbolicExecutionEnvironment(baseDir, proofFilePathInBaseDir,
-                mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
-                simplifyConditions);
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
+                    simplifyConditions);
             // Create new oracle file if required in a temporary directory
             createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                    includeConstraints, includeVariables, includeCallStack, includeReturnValues);
             // Read oracle file
             ExecutionNodeReader reader = new ExecutionNodeReader();
             IExecutionNode<?> oracleRoot = reader.read(oracleFile);
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                includeCallStack, false, includeReturnValues, includeConstraints);
+                    includeCallStack, false, includeReturnValues, includeConstraints);
             return env;
         } finally {
             // Restore original options
@@ -1995,49 +2020,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param containerTypeName The java class to test.
-     * @param methodFullName The method to test.
-     * @param precondition An optional precondition.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param containerTypeName                   The java class to test.
+     * @param methodFullName                      The method to test.
+     * @param precondition                        An optional precondition.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String javaPathInBaseDir, String containerTypeName, final String methodFullName,
-            String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
-            boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
-            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-            boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+                                                                                  String javaPathInBaseDir, String containerTypeName, final String methodFullName,
+                                                                                  String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
+                                                                                  boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
+                                                                                  int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
@@ -2051,23 +2076,23 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions = setDefaultTacletOptions(baseDir, javaPathInBaseDir,
-                containerTypeName, methodFullName);
+                    containerTypeName, methodFullName);
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                    methodFullName, precondition, mergeBranchConditions, useOperationContracts,
-                    useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
-                    aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                    simplifyConditions);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                            methodFullName, precondition, mergeBranchConditions, useOperationContracts,
+                            useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
+                            aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                            simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                includeCallStack, includeReturnValues);
+                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                    includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore original options
@@ -2089,49 +2114,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir The path to the java file inside the base directory.
-     * @param baseContractName The name of the contract.
-     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
-     * @param includeConstraints Include constraints?
-     * @param includeVariables Include variables?
-     * @param includeCallStack Include call stack?
-     * @param includeReturnValues Include method return values?
-     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions Merge branch conditions?
-     * @param useOperationContracts Use operation contracts?
-     * @param useLoopInvariants Use loop invariants?
-     * @param blockTreatmentContract Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
-     *        side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks Do alias checks?
-     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
-     *        characters.
-     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
-     *        printing.
+     * @param baseDir                             The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
+     * @param baseContractName                    The name of the contract.
+     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
+     * @param includeConstraints                  Include constraints?
+     * @param includeVariables                    Include variables?
+     * @param includeCallStack                    Include call stack?
+     * @param includeReturnValues                 Include method return values?
+     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions               Merge branch conditions?
+     * @param useOperationContracts               Use operation contracts?
+     * @param useLoopInvariants                   Use loop invariants?
+     * @param blockTreatmentContract              Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
+     *                                            side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks                         Do alias checks?
+     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
+     *                                            characters.
+     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
+     *                                            printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *        according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
-     *        {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
-     *        conditions.
+     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *                                            according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
+     *                                            {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
+     *                                            conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException Occurred Exception
-     * @throws IOException Occurred Exception
+     * @throws ProofInputException          Occurred Exception
+     * @throws IOException                  Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException Occurred Exception
-     * @throws ProblemLoaderException Occurred Exception
+     * @throws SAXException                 Occurred Exception
+     * @throws ProblemLoaderException       Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-            String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
-            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-            boolean simplifyConditions) throws ProofInputException, IOException,
+                                                                                  String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
+                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                                                                  boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
+                                                                                  boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
         try {
@@ -2142,22 +2167,22 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions =
-                setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
+                    setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
-                    useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                    truthValueEvaluationEnabled, simplifyConditions);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
+                            mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                            blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
+                            useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                            truthValueEvaluationEnabled, simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                includeCallStack, includeReturnValues);
+                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                    includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore taclet options
@@ -2169,67 +2194,72 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * Internal test method
      */
     private void internalDoSETTest(File oracleFile,
-            SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
-            String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
-            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-            boolean includeReturnValues)
+                                   SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
+                                   String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
+                                   boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+                                   boolean includeReturnValues)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-            new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
+                new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
         env.getProof().getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         int nodeCount;
         // Execute auto mode until no more symbolic execution tree nodes are found or no new rules
         // are applied.
         do {
-            // Store the number of nodes before start of the auto mode
-            nodeCount = env.getProof().countNodes();
-            // Run proof
-            env.getProofControl().startAndWaitForAutoMode(env.getProof());
-            // Update symbolic execution tree
-            env.getBuilder().analyse();
-            // Make sure that not to many set nodes are executed
-            Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
-            for (Integer value : executedSetNodesPerGoal.values()) {
-                assertNotNull(value);
-                assertTrue(value <= maximalNumberOfExecutedSetNodes,
-                    value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+            try {
+                // Store the number of nodes before start of the auto mode
+                nodeCount = env.getProof().countNodes();
+                // Run proof
+                env.getProofControl().startAndWaitForAutoMode(env.getProof());
+
+                // Update symbolic execution tree
+                env.getBuilder().analyse();
+                // Make sure that not to many set nodes are executed
+                Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
+                for (Integer value : executedSetNodesPerGoal.values()) {
+                    assertNotNull(value);
+                    assertTrue(value <= maximalNumberOfExecutedSetNodes,
+                            value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
             }
         } while (stopCondition.wasSetNodeExecuted() && nodeCount != env.getProof().countNodes());
         // Create new oracle file if required in a temporary directory
         createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-            includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
         // Read oracle file
         ExecutionNodeReader reader = new ExecutionNodeReader();
         IExecutionNode<?> oracleRoot = reader.read(oracleFile);
         assertNotNull(oracleRoot);
         // Make sure that the created symbolic execution tree matches the expected one.
         assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-            includeCallStack, false, includeReturnValues, includeConstraints);
+                includeCallStack, false, includeReturnValues, includeConstraints);
     }
 
     /**
      * Ensures that the default taclet options are defined.
      *
      * @param javaPathInBaseDir The path in the base directory to the java file.
-     * @param baseContractName The name of the contract to prove.
+     * @param baseContractName  The name of the contract to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseDir,
-            String baseContractName)
+                                                              String baseContractName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
-                    baseContractName,
-                    false, false, false,
-                    false, false, false,
-                    false, false, false,
-                    false, false);
+                    createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
+                            baseContractName,
+                            false, false, false,
+                            false, false, false,
+                            false, false, false,
+                            false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2238,26 +2268,26 @@ public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseD
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param baseDir The base directory which contains the java file.
+     * @param baseDir           The base directory which contains the java file.
      * @param javaPathInBaseDir The path in the base directory to the java file.
      * @param containerTypeName name of the type where the method is implemented/declared
-     * @param methodFullName The method to prove.
+     * @param methodFullName    The method to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(File baseDir,
-            String javaPathInBaseDir,
-            String containerTypeName,
-            String methodFullName)
+                                                              String javaPathInBaseDir,
+                                                              String containerTypeName,
+                                                              String methodFullName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                    methodFullName,
-                    null, false, false, false,
-                    false, false, false, false,
-                    false, false, false);
+                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                            methodFullName,
+                            null, false, false, false,
+                            false, false, false, false,
+                            false, false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2266,19 +2296,19 @@ public static Map<String, String> setDefaultTacletOptions(File baseDir,
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param javaFile The java file to load.
+     * @param javaFile          The java file to load.
      * @param containerTypeName The type name which provides the target.
-     * @param targetName The target to proof.
+     * @param targetName        The target to proof.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException Occurred Exception.
+     * @throws ProofInputException    Occurred Exception.
      */
     @SuppressWarnings("unused")
     public static Map<String, String> setDefaultTacletOptionsForTarget(File javaFile,
-            String containerTypeName, final String targetName)
+                                                                       String containerTypeName, final String targetName)
             throws ProblemLoaderException, ProofInputException {
         return HelperClassForTests.setDefaultTacletOptionsForTarget(javaFile, containerTypeName,
-            targetName);
+                targetName);
     }
 
     /**
@@ -2312,14 +2342,14 @@ public static void restoreTacletOptions(Map<String, String> options) {
     protected ITermProgramVariableCollectorFactory createNewProgramVariableCollectorFactory(
             final SymbolicExecutionBreakpointStopCondition breakpointParentStopCondition) {
         return services -> new TermProgramVariableCollectorKeepUpdatesForBreakpointconditions(
-            services, breakpointParentStopCondition);
+                services, breakpointParentStopCondition);
     }
 
     /**
      * Makes sure that two {@link Term}s are equal.
      *
      * @param expected The expected {@link Term}.
-     * @param actual The actual {@link Term}.
+     * @param actual   The actual {@link Term}.
      */
     protected void assertTerm(Term expected, Term actual) {
         if (expected != null) {
@@ -2339,7 +2369,7 @@ protected void assertTerm(Term expected, Term actual) {
      * Checks if one-step simplification is enabled in the given {@link Proof}.
      *
      * @param proof The {@link Proof} to read from or {@code null} to return the general settings
-     *        value.
+     *              value.
      * @return {@code true} one step simplification is enabled, {@code false} if disabled.
      */
     public static boolean isOneStepSimplificationEnabled(Proof proof) {
@@ -2349,9 +2379,9 @@ public static boolean isOneStepSimplificationEnabled(Proof proof) {
     /**
      * Defines if one-step simplification is enabled in general and within the {@link Proof}.
      *
-     * @param proof The optional {@link Proof}.
+     * @param proof   The optional {@link Proof}.
      * @param enabled {@code true} use one-step simplification, {@code false} do not use one-step
-     *        simplification.
+     *                simplification.
      */
     public static void setOneStepSimplificationEnabled(Proof proof, boolean enabled) {
         HelperClassForTests.setOneStepSimplificationEnabled(proof, enabled);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
deleted file mode 100644
index 3be1d2528d8..00000000000
--- a/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.uka.ilkd.key;
-
-/**
- * @author Alexander Weigl
- * @version 1 (14.10.23)
- */
-public interface Identifiable {
-    default String identification() {
-        return getClass().getName() + "_" + hashCode();
-    }
-}
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
index 0d3fd45622c..29a34424d09 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
@@ -550,19 +550,12 @@ protected void fireAutoModeStopped(ProofEvent e) {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void startAutoMode(Proof proof) {
-        startAutoMode(proof, proof.openEnabledGoals());
-    }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof) {
+    public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
         startAutoMode(proof);
         waitWhileAutoMode();
     }
@@ -571,7 +564,7 @@ public void startAndWaitForAutoMode(Proof proof) {
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) {
+    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException {
         startAutoMode(proof, goals);
         waitWhileAutoMode();
     }
@@ -580,7 +573,7 @@ public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) {
      * {@inheritDoc}
      */
     @Override
-    public void stopAndWaitAutoMode() {
+    public void stopAndWaitAutoMode() throws InterruptedException {
         stopAutoMode();
         waitWhileAutoMode();
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
index df59e0c1ae7..48dda5aa1f3 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
@@ -16,9 +16,11 @@
 import de.uka.ilkd.key.prover.impl.ApplyStrategy;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
 import de.uka.ilkd.key.util.ProofStarter;
-
 import org.key_project.util.collection.ImmutableList;
 
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * The default implementation of {@link ProofControl}.
  *
@@ -35,15 +37,20 @@ public class DefaultProofControl extends AbstractProofControl {
      */
     private Thread autoModeThread;
 
+    /**
+     * A condition which is non-null during auto-mode. You can wait for end of macro/auto on it.
+     */
+    private Condition inAutoMode;
+
     /**
      * Constructor.
      *
-     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *        to all started {@link ApplyStrategy} instances.
+     *                                  to all started {@link ApplyStrategy} instances.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-            DefaultUserInterfaceControl defaultProverTaskListener) {
+                               DefaultUserInterfaceControl defaultProverTaskListener) {
         super(defaultProverTaskListener);
         this.ui = ui;
     }
@@ -51,21 +58,21 @@ public DefaultProofControl(UserInterfaceControl ui,
     /**
      * Constructor.
      *
-     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *        to all started {@link ApplyStrategy} instances.
-     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     *                                  to all started {@link ApplyStrategy} instances.
+     * @param ruleCompletionHandler     An optional {@link RuleCompletionHandler}.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-            DefaultUserInterfaceControl defaultProverTaskListener,
-            RuleCompletionHandler ruleCompletionHandler) {
+                               DefaultUserInterfaceControl defaultProverTaskListener,
+                               RuleCompletionHandler ruleCompletionHandler) {
         super(defaultProverTaskListener, ruleCompletionHandler);
         this.ui = ui;
     }
 
     @Override
     public synchronized void startAutoMode(Proof proof, ImmutableList<Goal> goals,
-            ProverTaskListener ptl) {
+                                           ProverTaskListener ptl) {
         if (!isInAutoMode()) {
             autoModeThread = new AutoModeThread(proof, goals, ptl);
             autoModeThread.start();
@@ -79,19 +86,17 @@ public synchronized void stopAutoMode() {
         }
     }
 
+
     @Override
-    public void waitWhileAutoMode() {
-        while (isInAutoMode()) { // Wait until auto mode has stopped.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-            }
+    public void waitWhileAutoMode() throws InterruptedException {
+        if (inAutoMode != null) {
+            inAutoMode.await();
         }
     }
 
     @Override
     public boolean isInAutoMode() {
-        return autoModeThread != null;
+        return inAutoMode != null;
     }
 
     private class AutoModeThread extends Thread {
@@ -105,6 +110,9 @@ public AutoModeThread(Proof proof, ImmutableList<Goal> goals, ProverTaskListener
             this.proof = proof;
             this.goals = goals;
             this.ptl = ptl;
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -113,7 +121,7 @@ public void run() {
                 fireAutoModeStarted(new ProofEvent(proof));
                 ProofStarter starter = ptl != null
                         ? new ProofStarter(
-                            new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
+                        new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
                         : new ProofStarter(getDefaultProverTaskListener(), false);
                 starter.init(proof);
                 if (goals != null) {
@@ -122,6 +130,8 @@ public void run() {
                     starter.start();
                 }
             } finally {
+                inAutoMode.signalAll();
+                inAutoMode = null;
                 autoModeThread = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
@@ -150,6 +160,9 @@ public MacroThread(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
             this.node = node;
             this.macro = macro;
             this.posInOcc = posInOcc;
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -172,7 +185,9 @@ public void run() {
                 if (ptl != null) {
                     ptl.taskFinished(info);
                 }
+                inAutoMode.signalAll();
                 autoModeThread = null;
+                inAutoMode = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
         }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index 77b71eaf5df..f30b7bb97d1 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
@@ -123,7 +123,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode of.
      */
-    void startAutoMode(Proof proof);
+    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals());}
 
     /**
      * Starts the auto mode for the given {@link Proof} and the given {@link Goal}s.
@@ -143,13 +143,13 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * Stops the currently running auto mode and blocks the current {@link Thread} until auto mode
      * has stopped.
      */
-    void stopAndWaitAutoMode();
+    void stopAndWaitAutoMode() throws InterruptedException;
 
     /**
      * Blocks the current {@link Thread} while the auto mode of this {@link UserInterfaceControl} is
      * active.
      */
-    void waitWhileAutoMode();
+    void waitWhileAutoMode() throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -158,7 +158,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * @param proof The {@link Proof} to start auto mode and to wait for.
      * @param goals The {@link Goal}s to close.
      */
-    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals);
+    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -166,7 +166,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode and to wait for.
      */
-    void startAndWaitForAutoMode(Proof proof);
+    void startAndWaitForAutoMode(Proof proof) throws InterruptedException;
 
     void startFocussedAutoMode(PosInOccurrence focus, Goal goal);
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
index 962228f3ca8..ebe8d366f00 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
index 2844075269b..d024e192f97 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
@@ -35,7 +35,7 @@ public void taskStarted(TaskStartedInfo info) {
         numOfInvokedMacros++;
         if (superordinateListener != null) {
             superordinateListener.taskStarted(new DefaultTaskStartedInfo(TaskKind.Macro,
-                macroName + (macroName.length() == 0 ? "" : " -- ") + info.message(),
+                macroName + (macroName.isEmpty() ? "" : " -- ") + info.message(),
                 info.size()));
         }
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 533828bb803..06da529607f 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -23,13 +23,15 @@
 import de.uka.ilkd.key.rule.RuleApp;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.util.Pair;
-
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.lookup.Lookup;
 
+import java.util.*;
+import java.util.stream.Stream;
+
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -49,10 +51,14 @@ public class Node implements Iterable<Node> {
 
     private static final String NODES = "nodes";
 
-    /** the proof the node belongs to */
+    /**
+     * the proof the node belongs to
+     */
     private final Proof proof;
 
-    /** The parent node. **/
+    /**
+     * The parent node.
+     **/
     private Node parent = null;
     /**
      * The branch location of this proof node.
@@ -81,7 +87,9 @@ public class Node implements Iterable<Node> {
 
     private boolean closed = false;
 
-    /** contains non-logical content, used for user feedback */
+    /**
+     * contains non-logical content, used for user feedback
+     */
     private NodeInfo nodeInfo;
 
     /**
@@ -119,7 +127,7 @@ public class Node implements Iterable<Node> {
      * taclet with an addrule section on this node, then these taclets are stored in this list
      */
     private ImmutableSet<NoPosTacletApp> localIntroducedRules =
-        DefaultImmutableSet.nil();
+            DefaultImmutableSet.nil();
 
     /**
      * Holds the undo methods for the information added by rules to the {@code Goal.strategyInfos}.
@@ -162,7 +170,9 @@ public void setSequent(Sequent seq) {
         this.seq = seq;
     }
 
-    /** returns the sequent of this node */
+    /**
+     * returns the sequent of this node
+     */
     public Sequent sequent() {
         return seq;
     }
@@ -176,7 +186,9 @@ public NodeInfo getNodeInfo() {
         return nodeInfo;
     }
 
-    /** returns the proof the Node belongs to */
+    /**
+     * returns the proof the Node belongs to
+     */
     public Proof proof() {
         return proof;
     }
@@ -225,14 +237,16 @@ public RuleApp getAppliedRuleApp() {
         return appliedRuleApp;
     }
 
-    /** Returns the set of NoPosTacletApps at this node */
+    /**
+     * Returns the set of NoPosTacletApps at this node
+     */
     public Iterable<NoPosTacletApp> getLocalIntroducedRules() {
         return localIntroducedRules;
     }
 
     /**
      * Returns the set of created program variables known in this node.
-     *
+     * <p>
      * In the resulting list, the newest additions come first.
      *
      * @returns a non-null immutable list of program variables.
@@ -249,7 +263,7 @@ public void addLocalProgVars(Iterable<? extends IProgramVariable> elements) {
 
     /**
      * Returns the set of freshly created function symbols known to this node.
-     *
+     * <p>
      * In the resulting list, the newest additions come first.
      *
      * @return a non-null immutable list of function symbols.
@@ -444,7 +458,7 @@ List<Node> getLeaves() {
 
     /**
      * @return an iterator for the leaves of the subtree below this node. The computation is called
-     *         at every call!
+     * at every call!
      */
     public Iterator<Node> leavesIterator() {
         return new NodeIterator(getLeaves().iterator());
@@ -471,13 +485,14 @@ public Iterator<Node> subtreeIterator() {
         return new SubtreeIterator(this);
     }
 
-    /** @return number of children */
+    /**
+     * @return number of children
+     */
     public int childrenCount() {
         return children.size();
     }
 
     /**
-     *
      * @param i an index (starting at 0).
      * @return the i-th child of this node.
      */
@@ -488,7 +503,7 @@ public Node child(int i) {
     /**
      * @param child a child of this node.
      * @return the number of the node <code>child</code>, if it is a child of this node (starting
-     *         with <code>0</code>), <code>-1</code> otherwise
+     * with <code>0</code>), <code>-1</code> otherwise
      */
     public int getChildNr(Node child) {
         int res = 0;
@@ -528,16 +543,16 @@ public StringBuffer getUniqueTacletId() {
      * Helper for {@link #toString()}
      *
      * @param prefix needed to keep track if a line has to be printed
-     * @param tree the tree representation we want to add this subtree " @param preEnumeration the
-     *        enumeration of the parent without the last number
+     * @param tree   the tree representation we want to add this subtree " @param preEnumeration the
+     *               enumeration of the parent without the last number
      * @param postNr the last number of the parents enumeration
-     * @param maxNr the number of nodes at this level
-     * @param ownNr the place of this node at this level
+     * @param maxNr  the number of nodes at this level
+     * @param ownNr  the place of this node at this level
      * @return the string representation of this node.
      */
 
     private StringBuffer toString(String prefix, StringBuffer tree, String preEnumeration,
-            int postNr, int maxNr, int ownNr) {
+                                  int postNr, int maxNr, int ownNr) {
         Iterator<Node> childrenIt = childrenIterator();
         // Some constants
         String frontIndent = (maxNr > 1 ? " " : "");
@@ -588,7 +603,7 @@ private StringBuffer toString(String prefix, StringBuffer tree, String preEnumer
         while (childrenIt.hasNext()) {
             childId++;
             childrenIt.next().toString(prefix, tree, newEnumeration, newPostNr, children.size(),
-                childId);
+                    childId);
         }
 
         return tree;
@@ -645,7 +660,7 @@ public String name() {
      * this node.
      *
      * @return true iff the parent of this node has this node as child and this condition holds also
-     *         for the own children.
+     * for the own children.
      */
     public boolean sanityCheckDoubleLinks() {
         if (!root()) {
@@ -667,7 +682,9 @@ public boolean sanityCheckDoubleLinks() {
         return true;
     }
 
-    /** marks a node as closed */
+    /**
+     * marks a node as closed
+     */
     Node close() {
         closed = true;
         Node tmp = parent;
@@ -684,7 +701,7 @@ Node close() {
     /**
      * Opens a previously closed node and all its closed parents.
      * <p>
-     *
+     * <p>
      * This is, for instance, needed for the {@link MergeRule}: In a situation where a merge node
      * and its associated partners have been closed and the merge node is then pruned away, the
      * partners have to be reopened again. Otherwise, we have a soundness issue.
@@ -699,7 +716,9 @@ void reopen() {
         clearNameCache();
     }
 
-    /** @return true iff this inner node is closeable */
+    /**
+     * @return true iff this inner node is closeable
+     */
     private boolean isCloseable() {
         assert childrenCount() > 0;
         for (Node child : children) {
@@ -768,7 +787,7 @@ public Iterator<Node> iterator() {
      * Retrieves a user-defined data.
      *
      * @param service the class for which the data were registered
-     * @param <T> any class
+     * @param <T>     any class
      * @return null or the previous data
      * @see #register(Object, Class)
      */
@@ -786,7 +805,7 @@ public <T> T lookup(Class<T> service) {
     /**
      * Register a user-defined data in this node info.
      *
-     * @param obj an object to be registered
+     * @param obj     an object to be registered
      * @param service the key under it should be registered
      * @param <T>
      */
@@ -797,9 +816,9 @@ public <T> void register(T obj, Class<T> service) {
     /**
      * Remove a previous registered user-defined data.
      *
-     * @param obj registered object
+     * @param obj     registered object
      * @param service the key under which the data was registered
-     * @param <T> arbitray object
+     * @param <T>     arbitray object
      */
     public <T> void deregister(T obj, Class<T> service) {
         if (userData != null) {
@@ -837,4 +856,8 @@ public int getStepIndex() {
     void setStepIndex(int stepIndex) {
         this.stepIndex = stepIndex;
     }
+
+    public Stream<Node> childrenStream() {
+        return children.stream();
+    }
 }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
index d7ac6c484d0..6b97d88d82d 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
@@ -11,7 +11,6 @@
 import java.util.function.Predicate;
 import javax.swing.*;
 
-import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.*;
@@ -28,7 +27,6 @@
 import de.uka.ilkd.key.proof.replay.CopyingProofReplayer;
 import de.uka.ilkd.key.rule.NoPosTacletApp;
 import de.uka.ilkd.key.rule.OneStepSimplifier;
-import de.uka.ilkd.key.rule.Rule;
 import de.uka.ilkd.key.rule.merge.MergePartner;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp;
@@ -56,7 +54,7 @@
  * information, and methods to apply rules. Furthermore, it offers services that deliver the open
  * goals, namespaces and several other information about the current state of the proof.
  */
-public class Proof implements Named, Identifiable {
+public class Proof implements Named {
 
     /**
      * The time when the {@link Proof} instance was created.
@@ -1477,12 +1475,4 @@ public void copyCachedGoals(Proof referencedFrom, Consumer<Integer> callbackTota
             }
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String identification() {
-        return getClass().getName() + "_" + name + "_" + hashCode();
-    }
 }
diff --git a/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java b/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
index 57ad2025a7e..abd24dd8d6e 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/proof/io/TestZipProofSaving.java
@@ -33,7 +33,7 @@ private void loadZip(Path fileTarget) throws Exception {
     }
 
     private void proveAndSaveZip(Path file, Path fileTarget)
-            throws ProblemLoaderException, IOException {
+            throws ProblemLoaderException, InterruptedException {
         KeYEnvironment<DefaultUserInterfaceControl> env = KeYEnvironment.load(file.toFile());
         env.getProofControl().startAndWaitForAutoMode(env.getLoadedProof());
         GZipProofSaver proofSaver =
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
index 6f634c192f1..a80815bbe03 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.swing.*;
-
 import de.uka.ilkd.key.control.InteractionListener;
 import de.uka.ilkd.key.core.InterruptListener;
 import de.uka.ilkd.key.core.KeYMediator;
@@ -20,10 +16,15 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * The Class ProofMacroWorker is a swing worker for the application of proof macros.
  * <p>
@@ -39,7 +40,7 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
      * goals under the current pio, selection remains where it was.
      */
     private static final boolean SELECT_GOAL_AFTER_MACRO =
-        Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
+            Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
 
     /**
      * The {@link Node} to start macro at.
@@ -69,22 +70,26 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
     private Exception exception;
     private final List<InteractionListener> interactionListeners = new ArrayList<>();
 
+    private final Condition finish;
+
     /**
      * Instantiates a new proof macro worker.
      *
-     * @param node the {@link Node} to start macro at.
-     * @param macro the macro, not null
+     * @param node     the {@link Node} to start macro at.
+     * @param macro    the macro, not null
      * @param mediator the mediator, not null
      * @param posInOcc the position, possibly null
      */
     public ProofMacroWorker(Node node, ProofMacro macro, KeYMediator mediator,
-            PosInOccurrence posInOcc) {
+                            PosInOccurrence posInOcc) {
         assert macro != null;
         assert mediator != null;
         this.node = node;
         this.macro = macro;
         this.mediator = mediator;
         this.posInOcc = posInOcc;
+
+        finish = new ReentrantLock().newCondition();
     }
 
     @Override
@@ -93,7 +98,7 @@ protected ProofMacroFinishedInfo doInBackground() {
         Proof selectedProof = node.proof();
         info = ProofMacroFinishedInfo.getDefaultInfo(macro, selectedProof);
         ptl.taskStarted(
-            new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
+                new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
         try {
             synchronized (macro) {
                 info = macro.applyTo(mediator.getUI(), node, posInOcc, ptl);
@@ -105,6 +110,8 @@ protected ProofMacroFinishedInfo doInBackground() {
         } catch (final Exception exception) {
             // This should actually never happen.
             this.exception = exception;
+        } finally {
+            finish.signalAll();
         }
 
         return info;
@@ -120,8 +127,7 @@ protected void done() {
         synchronized (macro) {
             mediator.removeInterruptedListener(this);
             if (!isCancelled() && exception != null) { // user cancelled task is fine, we do not
-                                                       // report this
-                // This should actually never happen.
+                // report this // This should actually never happen.
                 LOGGER.error("", exception);
                 IssueDialog.showExceptionDialog(MainWindow.getInstance(), exception);
             }
@@ -138,7 +144,7 @@ protected void done() {
     }
 
     protected void emitProofMacroFinished(Node node, ProofMacro macro, PosInOccurrence posInOcc,
-            ProofMacroFinishedInfo info) {
+                                          ProofMacroFinishedInfo info) {
         interactionListeners.forEach((l) -> l.runMacro(node, macro, posInOcc, info));
     }
 
@@ -167,4 +173,11 @@ private void selectOpenGoalBelow() {
             }
         }
     }
+
+    /**
+     * @return a condition for waiting on this thread to be finished
+     */
+    public Condition getFinish() {
+        return finish;
+    }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
index 6c94d762e00..90c9398b076 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
@@ -183,6 +183,13 @@ public void done() {
         }
 
         mediator.removeInterruptedListener(this);
+        runWithDeadline(() -> mediator.startInterface(true), 1000);
+        runWithDeadline(() -> {
+            try {
+                mediator.getUI().getProofControl().stopAndWaitAutoMode();
+            } catch (InterruptedException ignored) {
+            }
+        }, 1000);
 
         final Proof proof = initiallySelectedGoal != null ? initiallySelectedGoal.proof()
                 : mediator.getSelectedProof();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index ceaba6d1bb1..2b8a53215d5 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -24,6 +24,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.awt.event.ActionEvent;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * This class provides an action for KeY UI which runs a set of specified proof files automatically.
  * The intent of this class is to have a massive test feature for the quality assurance of the KeY
@@ -73,7 +83,7 @@ public class RunAllProofsAction extends MainWindowAction {
     @NonNull
     private List<File> loadFiles() throws IOException {
         LOGGER.info("Use 'export {}=<...>' to set the input file for {}.", ENV_VARIABLE,
-            getClass().getSimpleName());
+                getClass().getSimpleName());
 
         InputStream stream;
         if (RUN_ALL_PROOFS_UI == null) {
@@ -87,7 +97,7 @@ private List<File> loadFiles() throws IOException {
         }
 
         try (BufferedReader in =
-            new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+                     new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             return in.lines().filter(it -> !it.startsWith("#") && !it.trim().isEmpty())
                     .map(it -> (it.startsWith("/") ? new File(it) : new File(exampleDir, it))
                             .getAbsoluteFile())
@@ -110,13 +120,13 @@ public RunAllProofsAction(MainWindow mainWindow) {
 
         setName("Run all proofs");
         setTooltip(
-            "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
+                "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        WindowUserInterfaceControl ui = mainWindow.getUserInterface();
 
+        WindowUserInterfaceControl ui = mainWindow.getUserInterface();
         for (int i = 0; i < files.size(); i++) {
             LOGGER.info("{}: {}\n", i, files.get(i));
         }
@@ -126,7 +136,7 @@ public void actionPerformed(ActionEvent e) {
                 ui.reportStatus(this, "Run: " + absFile);
                 LOGGER.info("Run: {}", absFile);
                 ProblemLoader problemLoader =
-                    ui.getProblemLoader(absFile, null, null, null, getMediator());
+                        ui.getProblemLoader(absFile, null, null, null, getMediator());
                 problemLoader.runSynchronously();
                 LOGGER.info("Loaded: {}", absFile);
 
@@ -135,7 +145,10 @@ public void actionPerformed(ActionEvent e) {
                 MediatorProofControl control = ui.getProofControl();
                 if (control.isAutoModeSupported(proof)) {
                     control.startAutoMode(proof, proof.openEnabledGoals());
-                    control.waitWhileAutoMode();
+                    try {
+                        control.waitWhileAutoMode();
+                    } catch (InterruptedException ignored) {
+                    }
                 }
                 LOGGER.info("Finish: ({}) {}", getMediator().getSelectedProof().closed(), absFile);
                 getMediator().getSelectedProof().dispose();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
index 89c4cb0d06b..50c05be74fa 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
@@ -172,7 +172,11 @@ public void taskFinished(TaskFinishedInfo info) {
         } else if (macroChosen()) {
             applyMacro();
         } else {
-            finish(proof);
+            try {
+                finish(proof);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -228,7 +232,7 @@ public void registerProofAggregate(ProofAggregate pa) {
         proofStack = proofStack.prepend(pa.getFirstProof());
     }
 
-    void finish(Proof proof) {
+    void finish(Proof proof) throws InterruptedException {
         // setInteractive(false) has to be called because the ruleAppIndex
         // has to be notified that we work in auto mode (CS)
         mediator.setInteractive(false);
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
index 54009075944..839de98f341 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import javax.swing.*;
 
@@ -45,6 +47,8 @@ public class MediatorProofControl extends AbstractProofControl {
     private final AbstractMediatorUserInterfaceControl ui;
     private AutoModeWorker worker;
 
+    private Condition inAutoMode;
+
     public MediatorProofControl(AbstractMediatorUserInterfaceControl ui) {
         super(ui, ui);
         this.ui = ui;
@@ -101,17 +105,14 @@ public void stopAutoMode() {
      * {@inheritDoc}
      */
     @Override
-    public void waitWhileAutoMode() {
+    public void waitWhileAutoMode() throws InterruptedException {
         if (SwingUtilities.isEventDispatchThread()) {
             LOGGER.error("", new IllegalStateException(
                 "tried to block the UI thread whilst waiting for auto mode to finish"));
             return; // do not block the UI thread
         }
-        while (ui.getMediator().isInAutoMode()) { // Wait until auto mode has stopped.
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-            }
+        if (inAutoMode != null) {
+            inAutoMode.await();
         }
     }
 
@@ -138,6 +139,7 @@ public boolean isAutoModeSupported(Proof proof) {
     public void runMacro(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
         KeYMediator mediator = ui.getMediator();
         final ProofMacroWorker worker = new ProofMacroWorker(node, macro, mediator, posInOcc);
+        inAutoMode = worker.getFinish();
         interactionListeners.forEach(worker::addInteractionListener);
         mediator.initiateAutoMode(node.proof(), true, false);
         mediator.addInterruptedListener(worker);
@@ -174,6 +176,9 @@ public AutoModeWorker(final Proof proof, final ImmutableList<Goal> goals,
             if (ui.getMediator().getAutoSaver() != null) {
                 applyStrategy.addProverTaskObserver(ui.getMediator().getAutoSaver());
             }
+
+            var lock = new ReentrantLock();
+            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -185,6 +190,9 @@ protected void done() {
             } catch (final CancellationException exception) {
                 // when the user canceled it's not an error
             } finally {
+                // release threads waiting on automode finish
+                inAutoMode.signalAll();
+
                 // make it possible to free memory and falsify the isAutoMode() property
                 worker = null;
                 // Clear strategy
@@ -212,7 +220,7 @@ private void notifyException(final Throwable exception) {
         }
 
         @Override
-        protected ApplyStrategyInfo doInBackground() throws Exception {
+        protected ApplyStrategyInfo doInBackground() {
             boolean stopMode =
                 proof.getSettings().getStrategySettings().getActiveStrategyProperties()
                         .getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 248210a9f7f..fd1b8352356 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -1,27 +1,75 @@
 package org.keyproject.key.api;
 
+import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
+import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.gui.Example;
 import de.uka.ilkd.key.gui.ExampleChooser;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFacade;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommandFacade;
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.proof.Statistics;
+import de.uka.ilkd.key.macros.scripts.ProofScriptEngine;
+import de.uka.ilkd.key.macros.scripts.ScriptException;
+import de.uka.ilkd.key.parser.Location;
+import de.uka.ilkd.key.pp.IdentitySequentPrintFilter;
+import de.uka.ilkd.key.pp.LogicPrinter;
+import de.uka.ilkd.key.pp.NotationInfo;
+import de.uka.ilkd.key.pp.PosTableLayouter;
+import de.uka.ilkd.key.proof.*;
+import de.uka.ilkd.key.proof.init.*;
+import de.uka.ilkd.key.proof.io.AbstractProblemLoader;
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import de.uka.ilkd.key.prover.ProverTaskListener;
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
+import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.util.KeYConstants;
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.keyproject.key.api.adapters.KeyAdapter;
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSet;
 import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.data.KeyIdentifications.*;
+import org.keyproject.key.api.internal.NodeText;
 import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.remoteclient.ClientApi;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-
-public record KeyApiImpl(KeyAdapter adapter) implements KeyApi {
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+public final class KeyApiImpl implements KeyApi {
+    private final KeyIdentifications data = new KeyIdentifications();
+
+    private ClientApi clientApi;
+    private final ProverTaskListener clientListener = new ProverTaskListener() {
+        @Override
+        public void taskStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        public void taskProgress(int position) {
+            clientApi.taskProgress(position);
+        }
+
+        @Override
+        public void taskFinished(TaskFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+    };
+    private final AtomicInteger uniqueCounter = new AtomicInteger();
+
+    public KeyApiImpl() {
+    }
 
     @Override
     @JsonRequest
@@ -49,120 +97,461 @@ public CompletableFuture<String> getVersion() {
     }
 
     @Override
-    public CompletableFuture<List<ProofMacro>> getAvailableMacros() {
+    public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                ProofMacroFacade.instance().getMacros().stream().toList()
+                ProofMacroFacade.instance().getMacros().stream()
+                        .map(ProofMacroDesc::from).toList()
         );
     }
 
     @Override
-    public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
+    public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                ProofScriptCommandFacade.instance().getScriptCommands().stream().toList());
+                ProofScriptCommandFacade.instance().getScriptCommands().stream().map(ProofScriptCommandDesc::from).toList());
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            var pe = new ProofScriptEngine(scriptLine, Location.UNDEFINED);
+
+            try {
+                pe.execute((AbstractUserInterfaceControl) env.getProofControl(), proof);
+                return null;
+            } catch (IOException | InterruptedException | ScriptException e) {
+                throw new RuntimeException(e);
+            }
+        });
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> macro(Proof id, String macroId, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            var macro = Objects.requireNonNull(ProofMacroFacade.instance().getMacro(macroId));
+
+            try {
+                var info = macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
+                return MacroStatistic.from(proofId, info);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> auto(Proof id, StreategyOptions options) {
-        return null;
+    public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            var env = data.find(proofId.env());
+            try {
+                env.getProofControl().startAndWaitForAutoMode(proof);
+                //clientListener);
+                return null;//MacroStatistic.from(proofId, info);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
     }
 
     @Override
-    public CompletableFuture<Boolean> dispose(Proof id) {
-        return null;
+    public CompletableFuture<Boolean> dispose(ProofId id) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(id);
+            data.dispose(id);
+            proof.dispose();
+            return true;
+        });
     }
 
     @Override
-    public CompletableFuture<NodeDesc> goals(Proof id) {
-        return null;
+    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened, boolean onlyEnabled) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            if (onlyOpened && !onlyEnabled) {
+                return asNodeDesc(proofId, proof.openGoals());
+            } else if (onlyEnabled && onlyOpened) {
+                return asNodeDesc(proofId, proof.openEnabledGoals());
+            } else {
+                return asNodeDesc(proofId, proof.allGoals());
+            }
+        });
+    }
+
+    private List<NodeDesc> asNodeDesc(ProofId proofId, ImmutableList<Goal> goals) {
+        return asNodeDesc(proofId, goals.stream().map(Goal::node));
+    }
+
+    private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
+        return nodes.map(it -> asNodeDesc(proofId, it)).toList();
+    }
+
+    private NodeDesc asNodeDesc(ProofId proofId, Node it) {
+        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(), it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
-    public CompletableFuture<NodeDesc> tree(Proof proof) {
-        return null;
+    public CompletableFuture<NodeDesc> tree(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return asNodeDescRecursive(proofId, proof.root());
+        });
+    }
+
+    private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
+        return new NodeDesc(new NodeId(proofId, root.serialNr()),
+                root.getNodeInfo().getBranchLabel(),
+                root.getNodeInfo().getScriptRuleApplication(),
+                root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList()
+        );
     }
 
     @Override
-    public CompletableFuture<NodeDesc> root(Proof proof) {
-        return null;
+    public CompletableFuture<NodeDesc> root(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return asNodeDesc(proofId, proof.root());
+        });
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId) {
-        return null;
+    public CompletableFuture<List<NodeDesc>> children(NodeId nodeId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(nodeId);
+            return asNodeDesc(nodeId.proofId(), node.childrenStream());
+        });
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId) {
+    public CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<Statistics> statistics(Proof proof) {
-        return null;
+    public CompletableFuture<Statistics> statistics(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return proof.getStatistics();
+        });
     }
 
     @Override
-    public CompletableFuture<TreeNodeDesc> treeRoot(Proof proof) {
+    public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId) {
+    public CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId) {
+    public CompletableFuture<List<TreeNodeDesc>> treeSubtree(ProofId proof, TreeNodeId nodeId) {
         return null;
     }
 
     @Override
-    public CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<SortDesc>> sorts(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var sorts = env.getServices().getNamespaces().sorts().allElements();
+            return sorts.stream().map(SortDesc::from).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<List<Function>> functions(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<FunctionDesc>> functions(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var functions = env.getServices().getNamespaces().functions().allElements();
+            return functions.stream().map(FunctionDesc::from).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env) {
-        return null;
+    public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(envId);
+            var contracts = env.getAvailableContracts();
+            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it)).toList();
+        });
     }
 
     @Override
-    public CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId) {
-        return null;
+    public CompletableFuture<ProofId> openContract(ContractId contractId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var env = data.find(contractId.envId());
+            var contracts = env.getAvailableContracts();
+            var contract = contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
+            if (contract.isPresent()) {
+                try {
+                    var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
+                    return data.register(contractId.envId(), proof);
+                } catch (ProofInputException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                return null;
+            }
+        });
     }
 
     @Override
-    public CompletableFuture<GoalText> print(Node id) {
-        return null;
+    public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(nodeId);
+            var env = data.find(nodeId.proofId().env());
+            var notInfo = new NotationInfo();
+            final var layouter = new PosTableLayouter(options.width(), options.indentation(), options.pure());
+            var lp = new LogicPrinter(notInfo, env.getServices(), layouter);
+            lp.printSequent(node.sequent());
+
+            var id = new NodeTextId(nodeId, uniqueCounter.getAndIncrement());
+            var t = new NodeText(lp.result(), layouter.getInitialPositionTable());
+            data.register(id, t);
+            return new NodeTextDesc(id, lp.result());
+        });
     }
 
+    private final IdentitySequentPrintFilter filter = new IdentitySequentPrintFilter();
+
     @Override
-    public CompletableFuture<List<TermAction>> actions(PrintId id, int pos) {
-        return null;
+    public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int pos) {
+        return CompletableFuture.supplyAsync(() -> {
+            var node = data.find(printId.nodeId());
+            var proof = data.find(printId.nodeId().proofId());
+            var goal = proof.getOpenGoal(node);
+            var nodeText = data.find(printId);
+            var pis = nodeText.table().getPosInSequent(pos, filter);
+            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis, goal)
+                    .getActions();
+        });
+
     }
 
     @Override
-    public CompletableFuture<List<TermAction>> applyAction(TermActionId id) {
+    public CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id) {
         return null;
     }
 
     @Override
-    public void freePrint(PrintId id) {
+    public void freePrint(NodeTextId printId) {
+        CompletableFuture.runAsync(() -> data.dispose(printId));
+    }
+
+    public void setClientApi(ClientApi remoteProxy) {
+        clientApi = remoteProxy;
+    }
+
+    private final DefaultUserInterfaceControl control = new MyDefaultUserInterfaceControl();
+
+    @Override
+    public CompletableFuture<ProofId> loadExample(String id) {
+        return CompletableFutures.computeAsync((c) -> {
+            var examples = ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+                    .stream().filter(it -> it.getName().equals(id)).findFirst();
+            if (examples.isPresent()) {
+                var ex = examples.get();
+                Proof proof = null;
+                KeYEnvironment<?> env = null;
+                try {
+                    var loader = control.load(JavaProfile.getDefaultProfile(),
+                            ex.getObligationFile(), null, null, null, null, true, null);
+                    InitConfig initConfig = loader.getInitConfig();
+
+                    env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                            loader.getProofScript(), loader.getResult());
+                    var envId = new EnvironmentId(env.toString());
+                    data.register(envId, env);
+                    proof = Objects.requireNonNull(env.getLoadedProof());
+                    var proofId = new ProofId(envId, proof.name().toString());
+                    return data.register(proofId, proof);
+                } catch (ProblemLoaderException e) {
+                    if (proof != null) proof.dispose();
+                    if (env != null) env.dispose();
+                    throw new RuntimeException(e);
+                }
+            }
+            throw new IllegalArgumentException("Unknown example");
+        });
+    }
+
+    @Override
+    public CompletableFuture<ProofId> loadProblem(ProblemDefinition problem) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+              /*  var loader = control.load(JavaProfile.getDefaultProfile(),
+                        ex.getObligationFile(), null, null, null, null, true, null);
+                InitConfig initConfig = loader.getInitConfig();
+
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                proof = Objects.requireNonNull(env.getLoadedProof());
+                var proofId = new ProofId(envId, proof.name().toString());
+                return data.register(proofId, proof);*/
+            return null;
+        });
 
     }
+
+    @Override
+    public CompletableFuture<ProofId> loadKey(String content) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+            try {
+                final var tempFile = File.createTempFile("json-rpc-", ".key");
+                Files.writeString(tempFile.toPath(), content);
+                var loader = control.load(JavaProfile.getDefaultProfile(),
+                        tempFile, null, null, null, null, true, null);
+                InitConfig initConfig = loader.getInitConfig();
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                proof = Objects.requireNonNull(env.getLoadedProof());
+                var proofId = new ProofId(envId, proof.name().toString());
+                return data.register(proofId, proof);
+            } catch (ProblemLoaderException | IOException e) {
+                if (proof != null) proof.dispose();
+                if (env != null) env.dispose();
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<ProofId> loadTerm(String term) {
+        return loadKey("\\problem{ " + term + " }");
+    }
+
+    @Override
+    public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params) {
+        return CompletableFutures.computeAsync((c) -> {
+            Proof proof = null;
+            KeYEnvironment<?> env = null;
+            try {
+                var loader = control.load(JavaProfile.getDefaultProfile(),
+                        params.keyFile(),
+                        params.classPath(),
+                        params.bootClassPath(),
+                        params.includes(),
+                        null,
+                        true,
+                        null);
+                InitConfig initConfig = loader.getInitConfig();
+                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+                        loader.getProofScript(), loader.getResult());
+                var envId = new EnvironmentId(env.toString());
+                data.register(envId, env);
+                if ((proof = env.getLoadedProof()) != null) {
+                    var proofId = new ProofId(envId, proof.name().toString());
+                    return Either.forRight(data.register(proofId, proof));
+                } else {
+                    return Either.forLeft(envId);
+                }
+            } catch (ProblemLoaderException e) {
+                if (proof != null) proof.dispose();
+                if (env != null) env.dispose();
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    private class MyDefaultUserInterfaceControl extends DefaultUserInterfaceControl {
+        @Override
+        public void taskStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        public void taskProgress(int position) {
+            clientApi.taskProgress(position);
+        }
+
+        @Override
+        public void taskFinished(TaskFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+
+        @Override
+        protected void macroStarted(TaskStartedInfo info) {
+            clientApi.taskStarted(info);
+        }
+
+        @Override
+        protected synchronized void macroFinished(ProofMacroFinishedInfo info) {
+            clientApi.taskFinished(info);
+        }
+
+        @Override
+        public void loadingStarted(AbstractProblemLoader loader) {
+            super.loadingStarted(loader);
+        }
+
+        @Override
+        public void loadingFinished(AbstractProblemLoader loader, IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList, AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
+            super.loadingFinished(loader, poContainer, proofList, result);
+        }
+
+        @Override
+        public void progressStarted(Object sender) {
+            super.progressStarted(sender);
+        }
+
+        @Override
+        public void progressStopped(Object sender) {
+            super.progressStopped(sender);
+        }
+
+        @Override
+        public void reportStatus(Object sender, String status, int progress) {
+            super.reportStatus(sender, status, progress);
+        }
+
+        @Override
+        public void reportStatus(Object sender, String status) {
+            super.reportStatus(sender, status);
+        }
+
+        @Override
+        public void resetStatus(Object sender) {
+            super.resetStatus(sender);
+        }
+
+        @Override
+        public void reportException(Object sender, ProofOblInput input, Exception e) {
+            super.reportException(sender, input, e);
+        }
+
+        @Override
+        public void setProgress(int progress) {
+            super.setProgress(progress);
+        }
+
+        @Override
+        public void setMaximum(int maximum) {
+            super.setMaximum(maximum);
+        }
+
+        @Override
+        public void reportWarnings(ImmutableSet<PositionedString> warnings) {
+            super.reportWarnings(warnings);
+        }
+
+        @Override
+        public void showIssueDialog(Collection<PositionedString> issues) {
+            super.showIssueDialog(issues);
+        }
+    }
+
+
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
new file mode 100644
index 00000000000..0a27c633e5a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
@@ -0,0 +1,8 @@
+package org.keyproject.key.api;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextDesc(NodeTextId id, String result)  {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
new file mode 100644
index 00000000000..a99bed5fda9
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api;
+
+import org.keyproject.key.api.data.KeyIdentifications.NodeId;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextId(NodeId nodeId, int nodeTextId) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 408cc36acdd..b95ae6eebe2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -115,6 +115,8 @@ public void run() {
         }
 
         try {
+            final var keyApi = new KeyApiImpl();
+
             if (websocket) {
                 var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
                         .setOutput(out)
@@ -122,14 +124,18 @@ public void run() {
                         .traceMessages(new PrintWriter(System.err))
                         .validateMessages(true);
                 launcherBuilder.configureGson(StartServer::configureJson);
-                launcherBuilder.setLocalService(new KeyApiImpl(adapter));
+                launcherBuilder.setLocalService(keyApi);
                 launcherBuilder.setRemoteInterface(ClientApi.class);
-                launcherBuilder.create().startListening().get();
+
+                final var clientApiLauncher = launcherBuilder.create();
+                keyApi.setClientApi(clientApiLauncher.getRemoteProxy());
+                clientApiLauncher.startListening().get();
             } else {
                 establishStreams();
                 try (var lin = in; var lout = out) {
-                    var listener = launch(lout, lin);
+                    var listener = launch(lout, lin, keyApi);
                     LOGGER.info("JSON-RPC is listening for requests");
+                    keyApi.setClientApi(listener.getRemoteProxy());
                     listener.startListening().get();
                 }
             }
@@ -143,7 +149,7 @@ public static void configureJson(GsonBuilder gsonBuilder) {
         adapter = new KeyAdapter(gsonBuilder);
     }
 
-    public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
+    public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
         // var localServices = getLocalServices();
         // var remoteInterfaces = getRemoteInterfaces();
         var launcherBuilder = new Launcher.Builder<ClientApi>()
@@ -154,7 +160,7 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in) {
 
         launcherBuilder.configureGson(StartServer::configureJson);
         //if (localServices != null && !localServices.isEmpty())
-        launcherBuilder.setLocalService(new KeyApiImpl(adapter));
+        launcherBuilder.setLocalService(keyApi);
         //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
new file mode 100644
index 00000000000..51e0053eed6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -0,0 +1,125 @@
+package org.keyproject.key.api;
+
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.control.ProofControl;
+import de.uka.ilkd.key.logic.Name;
+import de.uka.ilkd.key.logic.PosInOccurrence;
+import de.uka.ilkd.key.macros.ProofMacro;
+import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.pp.PosInSequent;
+import de.uka.ilkd.key.proof.Goal;
+import de.uka.ilkd.key.rule.*;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSLList;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.TermActionDesc;
+import org.keyproject.key.api.data.TermActionKind;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class TermActionUtil {
+    private static final Set<Name> CLUTTER_RULESETS =
+            Set.of(new Name("notHumanReadable"),
+                    new Name("obsolete"),
+                    new Name("pullOutQuantifierAll"),
+                    new Name("pullOutQuantifierEx"));
+    private static final Set<Name> CLUTTER_RULES = Set.of(
+            new Name("cut_direct_r"),
+            new Name("cut_direct_l"),
+            new Name("case_distinction_r"),
+            new Name("case_distinction_l"),
+            new Name("local_cut"),
+            new Name("commute_and_2"),
+            new Name("commute_or_2"),
+            new Name("boxToDiamond"),
+            new Name("pullOut"),
+            new Name("typeStatic"),
+            new Name("less_is_total"),
+            new Name("less_zero_is_total"),
+            new Name("applyEqReverse"),
+
+            // the following are used for drag'n'drop interactions
+            new Name("eqTermCut"),
+            new Name("instAll"),
+            new Name("instEx")
+    );
+    private static final Set<String> FILTER_SCRIPT_COMMANDS = Set.of(
+            "exit",
+            "leave",
+            "javascript",
+            "skip",
+            "macro",
+            "rule",
+            "script");
+
+    private final PosInSequent pos;
+    private final Goal goal;
+    private final PosInOccurrence occ;
+
+    private final List<TermActionDesc> actions = new ArrayList<>(1024);
+    private final NodeTextId nodeTextId;
+
+    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env, @NonNull PosInSequent pos, @NonNull Goal goal) {
+        this.pos = pos;
+        this.goal = goal;
+        this.nodeTextId = nodeTextId;
+        occ = pos.getPosInOccurrence();
+        ProofControl c = env.getUi().getProofControl();
+        final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
+        for (ProofMacro macro : ProofMacroFacade.instance().getMacros()) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "macro:" + macro.getScriptCommandName());
+            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(), macro.getCategory(), TermActionKind.Macro);
+            add(ta);
+        }
+        ImmutableList<TacletApp> findTaclet = c.getFindTaclet(goal, occ);
+        var find = removeRewrites(findTaclet)
+                .prepend(c.getRewriteTaclet(goal, occ));
+        var nofind = c.getNoFindTaclet(goal);
+
+
+        for (TacletApp tacletApp : find) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "find:" + tacletApp.rule());
+            TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
+                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+            add(ta);
+        }
+
+        for (TacletApp tacletApp : nofind) {
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "nofind:" + tacletApp.rule());
+            TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
+                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+            add(ta);
+        }
+    }
+
+    private void add(TermActionDesc ta) {
+        actions.add(ta);
+    }
+
+    /**
+     * Removes RewriteTaclet from the list.
+     *
+     * @param list the IList<Taclet> from where the RewriteTaclet are removed
+     * @return list without RewriteTaclets
+     */
+    private static ImmutableList<TacletApp> removeRewrites(
+            ImmutableList<TacletApp> list) {
+        ImmutableList<TacletApp> result = ImmutableSLList.nil();
+        for (TacletApp tacletApp : list) {
+            Taclet taclet = tacletApp.taclet();
+            result = (taclet instanceof RewriteTaclet ? result : result.prepend(tacletApp));
+        }
+        return result;
+    }
+
+    public List<TermActionDesc> getActions() {
+        return actions;
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 9168a2128f5..68b330491fc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -1,20 +1,14 @@
 package org.keyproject.key.api.adapters;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import de.uka.ilkd.key.Identifiable;
 import de.uka.ilkd.key.logic.op.Function;
 import de.uka.ilkd.key.macros.ProofMacro;
-import de.uka.ilkd.key.macros.ProofMacroFacade;
-import de.uka.ilkd.key.proof.Proof;
 import org.keyproject.key.api.data.MacroDescription;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Type;
 
 /**
@@ -22,40 +16,39 @@
  * @version 1 (14.10.23)
  */
 public class KeyAdapter {
-    private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    //private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
     //private final TypeAdapter<Object> adaptor;
 
     public KeyAdapter(GsonBuilder gson) {
         gson.registerTypeAdapter(File.class, new FileTypeAdapter());
-        gson.registerTypeAdapter(Function.class, new FunctionTypeAdapter());
-        gson.registerTypeAdapter(Proof.class, new IdentifiableTypeAdapter());
-        gson.registerTypeAdapter(ProofMacro.class, new MacroTypeAdapter());
-        //adaptor = gson.create().getAdapter(Object.class);
+        //gson.registerTypeAdapter(Function.class, new FunctionSerializer());
+        //gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
     }
 
 
+    /*
     //translating entities to identification strings
-    public String insert(Identifiable p) {
+    public void insert(Identifiable p) {
         var id = p.identification();
         if (!map.containsKey(id)) {
             map.put(id, new WeakReference<>(p));
         }
-        return id;
     }
 
     public Object find(String id) {
         return map.get(id).get();
     }
     //endregion
+    */
 
-    class MacroTypeAdapter implements JsonSerializer<ProofMacro> {
+    static class MacroSerializer implements JsonSerializer<ProofMacro> {
         @Override
         public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
             return context.serialize(MacroDescription.from(src));
         }
     }
 
-    class FileTypeAdapter extends TypeAdapter<File> {
+    static class FileTypeAdapter extends TypeAdapter<File> {
         @Override
         public void write(JsonWriter out, File value) throws IOException {
             out.value(value.toString());
@@ -67,7 +60,7 @@ public File read(JsonReader in) throws IOException {
         }
     }
 
-    class FunctionTypeAdapter implements JsonSerializer<Function> {
+    static class FunctionSerializer implements JsonSerializer<Function> {
         @Override
         public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
             var obj = new JsonObject();
@@ -81,7 +74,7 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
         }
     }
 
-    class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
+    /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
         @Override
         public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
             return (Identifiable) find(json.getAsString());
@@ -92,5 +85,5 @@ public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerialization
             insert(src);
             return context.serialize(src.identification());
         }
-    }
+    }*/
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index a81f8d863db..531bc2fb56d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -1,8 +1,17 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.speclang.Contract;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record ContractDesc() {
+public record ContractDesc(KeyIdentifications.ContractId contractId, String name, String displayName,
+                           String typeName, String htmlText, String plainText) {
+    public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services, Contract it) {
+        return new ContractDesc(new KeyIdentifications.ContractId(envId, it.id()),
+                it.getName(), it.getDisplayName(), it.getTypeName(),
+                it.getHTMLText(services), it.getPlainText(services));
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 0c612b44cc2..1868871c0e3 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -1,10 +1,21 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.logic.op.Function;
+
 import java.util.List;
 
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record FunctionDesc(String name, String sort, List<String> sorts) {
+public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts, boolean rigid,
+                           boolean unique, boolean skolemConstant) {
+    public static FunctionDesc from(Function fn) {
+        return new FunctionDesc(fn.name().toString(), fn.proofToString(),
+                SortDesc.from(fn.sort()),
+                fn.argSorts().stream().map(SortDesc::from).toList(),
+                fn.isRigid(),
+                fn.isUnique(),
+                fn.isSkolemConstant());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
deleted file mode 100644
index 7a0e2f264e0..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.keyproject.key.api.data;
-
-import de.uka.ilkd.key.pp.PositionTable;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record GoalText(PrintId id, String text, PositionTable table) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
new file mode 100644
index 00000000000..0698a50a982
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -0,0 +1,163 @@
+package org.keyproject.key.api.data;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import de.uka.ilkd.key.control.KeYEnvironment;
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.internal.NodeText;
+
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class KeyIdentifications {
+    private final BiMap<EnvironmentId, KeyEnvironmentContainer> mapEnv = HashBiMap.create(16);
+
+    public KeyEnvironmentContainer getContainer(EnvironmentId environmentId) {
+        return Objects.requireNonNull(mapEnv.get(environmentId), "Could not find environment for id" + environmentId);
+    }
+
+    public ProofContainer getContainer(ProofId proofId) {
+        return Objects.requireNonNull(getContainer(proofId.env()).mapProof.get(proofId),
+                "Could not find proof for id" + proofId);
+    }
+
+    public KeYEnvironment<?> find(EnvironmentId envid) {
+        return Objects.requireNonNull(getContainer(envid).env.get(), "Environment was removed by gc");
+    }
+
+    @NonNull
+    public Proof find(ProofId proofId) {
+        return Objects.requireNonNull(getContainer(proofId).wProof.get(), "Could not find a proof for id " + proofId);
+    }
+
+    @NonNull
+    public NodeText find(NodeTextId nodeTextId) {
+        return Objects.requireNonNull(getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
+                "Could not find a print-out with the id " + nodeTextId);
+    }
+
+    public void dispose(NodeTextId nodeTextId) {
+        var c = getContainer(nodeTextId.nodeId().proofId());
+        c.mapGoalText.remove(nodeTextId);
+    }
+
+    public void dispose(ProofId id) {
+        var c = getContainer(id);
+        getContainer(id.env).mapProof.remove(id);
+        c.dispose();
+    }
+
+    public Node find(NodeId nodeId) {
+        @NonNull Proof p = find(nodeId.proofId);
+        var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
+        return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
+    }
+
+    public ProofId register(EnvironmentId envId, Proof proof) {
+        var id = new ProofId(envId, proof.name().toString());
+        getContainer(envId).mapProof.put(id, new ProofContainer(proof));
+        return id;
+    }
+
+    public void register(NodeTextId nodeId, NodeText nodeText) {
+        var c = getContainer(nodeId.nodeId().proofId());
+        c.mapGoalText().put(nodeId, nodeText);
+
+    }
+
+    public EnvironmentId register(EnvironmentId envId, KeYEnvironment<?> env) {
+        mapEnv.put(envId, new KeyEnvironmentContainer(env));
+        return envId;
+    }
+
+    public ProofId register(ProofId proofId, Proof proof) {
+        getContainer(proofId.env()).mapProof.put(proofId, new ProofContainer(proof));
+        return proofId;
+    }
+
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record EnvironmentId(String envId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record ContractId(EnvironmentId envId, int contractId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (29.10.23)
+     */
+    public record NodeId(ProofId proofId, int nodeId) {
+    }
+
+    public record ProofId(EnvironmentId env, String proofId) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record PrintId(String id) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record TermActionId(NodeId nodeId, String pio, String id) {
+    }
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (13.10.23)
+     */
+    public record TreeNodeId(String id) {
+    }
+
+
+    /**
+     * @author Alexander Weigl
+     * @version 1 (28.10.23)
+     */
+    public record KeyEnvironmentContainer(WeakReference<KeYEnvironment<?>> env,
+                                          BiMap<ProofId, ProofContainer> mapProof
+    ) {
+
+        public KeyEnvironmentContainer(KeYEnvironment<?> env) {
+            this(new WeakReference<>(env), HashBiMap.create(1));
+        }
+
+        void dispose() {
+            env.clear();
+            mapProof.clear();
+        }
+    }
+
+    private record ProofContainer(WeakReference<Proof> wProof,
+                                  BiMap<NodeId, WeakReference<Node>> mapNode,
+                                  BiMap<TreeNodeId, WeakReference<TreeNodeDesc>> mapTreeNode,
+                                  BiMap<NodeTextId, NodeText> mapGoalText
+    ) {
+        public ProofContainer(Proof proof) {
+            this(new WeakReference<>(proof), HashBiMap.create(16), HashBiMap.create(16), HashBiMap.create(16));
+        }
+
+        void dispose() {
+            mapNode.clear();
+        }
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index 74c2d9d1cc4..b0c2397d1f3 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -1,8 +1,15 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record MacroStatistic() {
+public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, boolean cancelled, int appliedRules,
+                             int closedGoals) {
+    public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
+        return new MacroStatistic(proofId, info.getMacro().getName(), info.isCancelled(),
+                info.getAppliedRules(), info.getClosedGoals());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index 9bc8ad0cd04..9e24e0f4cd7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,8 +1,18 @@
 package org.keyproject.key.api.data;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.List;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record NodeDesc() {
+public record NodeDesc(KeyIdentifications.NodeId nodeid, String branchLabel,
+                       boolean scriptRuleApplication,
+                       @Nullable List<NodeDesc> children
+) {
+    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication) {
+        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null);
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
deleted file mode 100644
index 3d4893d43e4..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.data;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record PrintId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
new file mode 100644
index 00000000000..31981c61beb
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -0,0 +1,14 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.macros.ProofMacro;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ProofMacroDesc(String name, String category, String description, String scriptCommandName) {
+    public static ProofMacroDesc from(ProofMacro proofMacro) {
+        return new ProofMacroDesc(proofMacro.getName(), proofMacro.getCategory(),
+                proofMacro.getDescription(), proofMacro.getScriptCommandName());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
new file mode 100644
index 00000000000..f6eef733d08
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -0,0 +1,13 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ProofScriptCommandDesc() {
+    public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
+        return null;
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index b582b4a73f5..66df02ee6b0 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -1,8 +1,19 @@
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.logic.sort.Sort;
+
+import java.util.List;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record SortDesc() {
+public record SortDesc(String string, String documentation,
+                       List<SortDesc> extendsSorts,
+                       boolean anAbstract, String s) {
+    public static SortDesc from(Sort sort) {
+        return new SortDesc(sort.name().toString(), sort.getDocumentation(),
+                sort.extendsSorts().stream().map(SortDesc::from).toList(),
+                sort.isAbstract(), sort.declarationString());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
deleted file mode 100644
index b69046120f5..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api.data;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TermAction(TermActionId commandId, String displayName) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
new file mode 100644
index 00000000000..b27ac08a279
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -0,0 +1,11 @@
+package org.keyproject.key.api.data;
+
+import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record TermActionDesc(TermActionId commandId, String displayName, String description, String category,
+                             TermActionKind kind) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
index 7951c776af4..96d22acee47 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
@@ -1,8 +1,2 @@
 package org.keyproject.key.api.data;
 
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TermActionId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
new file mode 100644
index 00000000000..cc7d9aec71a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.data;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public enum TermActionKind {
+    BuiltIn, Script, Macro, Taclet
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
index 3dba5cc492e..96d22acee47 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
@@ -1,8 +1,2 @@
 package org.keyproject.key.api.data;
 
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record TreeNodeId(String id) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
new file mode 100644
index 00000000000..5750fea944d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
@@ -0,0 +1,12 @@
+package org.keyproject.key.api.internal;
+
+import de.uka.ilkd.key.pp.InitialPositionTable;
+import de.uka.ilkd.key.pp.PositionTable;
+import de.uka.ilkd.key.proof.Node;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record NodeText(String text, InitialPositionTable table) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index e82ca44ae28..e84a0152760 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -1,11 +1,10 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.ContractDesc;
+import org.keyproject.key.api.data.FunctionDesc;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.SortDesc;
 
 import java.util.List;
@@ -18,14 +17,14 @@
 @JsonSegment("env")
 public interface EnvApi {
     @JsonRequest
-    CompletableFuture<List<SortDesc>> sorts(KeYEnvironment<?> env);
+    CompletableFuture<List<SortDesc>> sorts(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<List<Function>> functions(KeYEnvironment<?> env);
+    CompletableFuture<List<FunctionDesc>> functions(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<List<ContractDesc>> contracts(KeYEnvironment<?> env);
+    CompletableFuture<List<ContractDesc>> contracts(EnvironmentId env);
 
     @JsonRequest
-    CompletableFuture<Proof> openContract(KeYEnvironment<?> env, String contractId);
+    CompletableFuture<ProofId> openContract(ContractId contractId);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index fe678b8f04e..2f34293f0d5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -1,13 +1,12 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Node;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.GoalText;
-import org.keyproject.key.api.data.PrintId;
-import org.keyproject.key.api.data.TermAction;
-import org.keyproject.key.api.data.TermActionId;
+import org.keyproject.key.api.NodeTextDesc;
+import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -19,14 +18,14 @@
 @JsonSegment("goal")
 public interface GoalApi {
     @JsonRequest
-    CompletableFuture<GoalText> print(Node id);
+    CompletableFuture<NodeTextDesc> print(NodeId id, PrintOptions options);
 
     @JsonRequest
-    CompletableFuture<List<TermAction>> actions(PrintId id, int pos);
+    CompletableFuture<List<TermActionDesc>> actions(NodeTextId id, int pos);
 
     @JsonRequest("apply_action")
-    CompletableFuture<List<TermAction>> applyAction(TermActionId id);
+    CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id);
 
     @JsonNotification("free")
-    void freePrint(PrintId id);
+    void freePrint(NodeTextId id);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index ac650359a74..56a166f9af7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -3,5 +3,5 @@
 /**
  * The combined interface that is provided by KeY.
  */
-public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi {
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi, ProofLoadApi{
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index a4a16b66b02..f101a47f16a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,12 +1,13 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.macros.ProofMacro;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.ProofMacroDesc;
+import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 
 @JsonSegment("meta")
 public interface MetaApi {
@@ -14,8 +15,8 @@ public interface MetaApi {
     CompletableFuture<String> getVersion();
 
     @JsonRequest("available_macros")
-    CompletableFuture<List<ProofMacro>> getAvailableMacros();
+    CompletableFuture<List<ProofMacroDesc>> getAvailableMacros();
 
     @JsonRequest("available_script_commands")
-    CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands();
+    CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
new file mode 100644
index 00000000000..6555b2a16fb
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.remoteapi;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record PrintOptions(boolean unicode, int width, int indentation, boolean pure,
+                           boolean termLabels) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index 16c9f390b89..e496b7a4d38 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -1,9 +1,8 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Node;
-import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.Statistics;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
 import org.keyproject.key.api.data.StreategyOptions;
@@ -17,32 +16,32 @@
  */
 public interface ProofApi {
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine, StreategyOptions options);
+    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> macro(Proof proof, String macroId, StreategyOptions options);
+    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> auto(Proof proof, StreategyOptions options);
+    CompletableFuture<MacroStatistic> auto(ProofId proof, StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<Boolean> dispose(Proof proof);
+    CompletableFuture<Boolean> dispose(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> goals(Proof proof);
+    CompletableFuture<List<NodeDesc>> goals(ProofId proof, boolean onlyOpened, boolean onlyEnabled);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> tree(Proof proof);
+    CompletableFuture<NodeDesc> tree(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<NodeDesc> root(Proof proof);
+    CompletableFuture<NodeDesc> root(ProofId proof);
 
     @JsonRequest
-    CompletableFuture<List<NodeDesc>> children(Proof proof, Node nodeId);
+    CompletableFuture<List<NodeDesc>> children(NodeId nodeId);
 
     @JsonRequest
-    CompletableFuture<List<NodeDesc>> pruneTo(Proof proof, Node nodeId);
+    CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId);
 
     @JsonRequest
-    CompletableFuture<Statistics> statistics(Proof proof);
+    CompletableFuture<Statistics> statistics(ProofId proof);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
similarity index 50%
rename from keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
rename to keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 14d737fd5d6..9ffedadf57d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -1,10 +1,16 @@
-package org.keyproject.key.api.data;
+package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.KeyIdentifications.EnvironmentId;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
+import org.keyproject.key.api.data.LoadParams;
+import org.keyproject.key.api.data.ProblemDefinition;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -15,20 +21,29 @@
  * @since v1
  */
 @JsonSegment("loading")
-public interface ProofLoading {
+public interface ProofLoadApi {
     /**
      * I am not sure whether this is helpful. Mainly a feature for testing?!
      * @param id
      * @return
      */
     @JsonRequest
-    CompletableFuture<Proof> loadExample(String id);
+    CompletableFuture<ProofId> loadExample(String id);
 
     /**
      *
      */
     @JsonRequest
-    CompletableFuture<Proof> loadProblem(ProblemDefinition problem);
+    CompletableFuture<ProofId> loadProblem(ProblemDefinition problem);
+
+    /**
+     *
+     */
+    @JsonRequest
+    CompletableFuture<ProofId> loadKey(String content);
+
+    @JsonRequest
+    CompletableFuture<ProofId> loadTerm(String term);
 
     /**
      * Test!
@@ -38,5 +53,5 @@ public interface ProofLoading {
      * @throws ProblemLoaderException if something went wrong
      */
     @JsonRequest
-    CompletableFuture<KeYEnvironment<?>> load(LoadParams params) throws ProblemLoaderException;
+    CompletableFuture<Either<EnvironmentId,ProofId>> load(LoadParams params) throws ProblemLoaderException;
 }
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index 88f5cad0330..d3225919d63 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -1,10 +1,10 @@
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
+import org.keyproject.key.api.data.KeyIdentifications.TreeNodeId;
 import org.keyproject.key.api.data.TreeNodeDesc;
-import org.keyproject.key.api.data.TreeNodeId;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -16,11 +16,11 @@
 @JsonSegment("proofTree")
 public interface ProofTreeApi {
     @JsonRequest("root")
-    CompletableFuture<TreeNodeDesc> treeRoot(Proof id);
+    CompletableFuture<TreeNodeDesc> treeRoot(ProofId id);
 
     @JsonRequest("children")
-    CompletableFuture<List<TreeNodeDesc>> treeChildren(Proof proof, TreeNodeId nodeId);
+    CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId);
 
     @JsonRequest("subtree")
-    CompletableFuture<List<TreeNodeDesc>> treeSubtree(Proof proof, TreeNodeId nodeId);
+    CompletableFuture<List<TreeNodeDesc>> treeSubtree(ProofId proof, TreeNodeId nodeId);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index a7aebdca1bf..ca086eae72f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api.remoteclient;
 
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
@@ -61,5 +63,10 @@ public interface ClientApi {
      */
     @JsonRequest
     CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
+
+
+    void taskFinished(TaskFinishedInfo info);
+    void taskProgress(int position);
+    void taskStarted(TaskStartedInfo info);
     //endregion
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 1b63674ce67..b275265b6c7 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api;
 
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
 import org.keyproject.key.api.remoteclient.*;
 
 import javax.annotation.Nullable;
@@ -32,4 +34,19 @@ public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParam
     public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params) {
         return null;
     }
+
+    @Override
+    public void taskFinished(TaskFinishedInfo info) {
+        System.out.println(info);
+    }
+
+    @Override
+    public void taskProgress(int position) {
+
+    }
+
+    @Override
+    public void taskStarted(TaskStartedInfo info) {
+        System.out.println(info);
+    }
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index edbe4aee393..ae34b339231 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -24,7 +25,7 @@ public class TestRpc {
     private KeyApi keyApi;
 
     @BeforeEach
-    void setup() throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    void setup() throws IOException {
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
         PipedInputStream inServer = new PipedInputStream();
@@ -33,7 +34,9 @@ void setup() throws IOException, ExecutionException, InterruptedException, Timeo
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer);
+        KeyApiImpl impl = new KeyApiImpl(new KeyAdapter(null));
+        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer, impl);
+        impl.setClientApi(serverLauncher.getRemoteProxy());
 
         var client = new SimpleClient();
         Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
diff --git a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
index 8b8f69d3bf3..5d7647eaf34 100644
--- a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
+++ b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.exploration;
 
-import java.io.File;
-
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.logic.*;
 import de.uka.ilkd.key.nparser.KeyIO;
@@ -12,13 +10,13 @@
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-
-import org.key_project.util.collection.ImmutableList;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.key_project.util.collection.ImmutableList;
+
+import java.io.File;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -85,7 +83,7 @@ public void testAdditionAntec() {
 
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-            "Parent is marked as ExplorationNode and data contains Exploration Action");
+                "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -127,7 +125,7 @@ public void testAdditionSucc() {
         testAddition(withAddedTerm, justification, added, false);
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-            "Parent is marked as ExplorationNode and data contains Exploration Action");
+                "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -148,9 +146,9 @@ public void testChangeFormula() {
         assertSame(1, goals.size(), "Prerequisite for test");
         Sequent sequent = goals.head().node().sequent();
         PosInOccurrence pio =
-            new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
+                new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
         expService.applyChangeFormula(goals.head(), pio, sequent.succedent().get(0).formula(),
-            change);
+                change);
         ImmutableList<Goal> newCreatedGoals = currentProof.openGoals();
 
         assertEquals(2, newCreatedGoals.size(), "Two new goals created");
@@ -168,13 +166,16 @@ public void testChangeFormula() {
         assertNotNull(justificationBranch.node().lookup(ExplorationNodeData.class));
 
         assertEquals(new Name("hide_right"), hideNode.getAppliedRuleApp().rule().name(),
-            "Hide Right was applied");
+                "Hide Right was applied");
         // set all goals to interactive
         justificationBranch.setEnabled(true);
         // perform proof, it has to close
-        env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
-        assertTrue(currentProof.closed(), "Proof is closed");
-
+        try {
+            env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
+            assertTrue(currentProof.closed(), "Proof is closed");
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -183,34 +184,34 @@ public void testChangeFormula() {
      */
     private void testAddition(Goal withAddedTerm, Goal justification, Term added, boolean antec) {
         Semisequent semiSeqAdded =
-            antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+                antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
         Semisequent parentSemiSeqOfAdded =
-            antec ? withAddedTerm.node().parent().sequent().antecedent()
-                    : withAddedTerm.node().parent().sequent().succedent();
+                antec ? withAddedTerm.node().parent().sequent().antecedent()
+                        : withAddedTerm.node().parent().sequent().succedent();
 
         Semisequent semiSeqUntouched =
-            !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+                !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
 
         Semisequent parentSemiSeqOfUntouched =
-            !antec ? withAddedTerm.node().parent().sequent().antecedent()
-                    : withAddedTerm.node().parent().sequent().succedent();
+                !antec ? withAddedTerm.node().parent().sequent().antecedent()
+                        : withAddedTerm.node().parent().sequent().succedent();
 
 
         assertSame(semiSeqAdded.size(), parentSemiSeqOfAdded.size() + 1,
-            "The size of the added semisequent has changed");
+                "The size of the added semisequent has changed");
         assertEquals(semiSeqAdded.get(0).formula(), added, "Added Term is indeed added");
         assertFalse(justification.isAutomatic(), "Justification branch is marked as interactive");
 
         assertSame(semiSeqUntouched.size(), parentSemiSeqOfUntouched.size(),
-            "The size if untouched semisequents is the same");
+                "The size if untouched semisequents is the same");
         assertEquals(semiSeqUntouched, parentSemiSeqOfUntouched,
-            "The  untouched semisequents are equal");
+                "The  untouched semisequents are equal");
 
         Node parent = withAddedTerm.node().parent();
 
         assertEquals(parent, justification.node().parent(), "Both nodes have the same parent");
         assertEquals(new Name("cut"), parent.getAppliedRuleApp().rule().name(),
-            "The addition was inserted using the cut rule");
+                "The addition was inserted using the cut rule");
     }
 
     /**

From 46f0cefe62bbf4b6688d6c8240fd95cc0fcba3af Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 29 Oct 2023 22:44:19 +0100
Subject: [PATCH 15/50] more doc and py generation

---
 api.meta.json                                 | 1144 +++++++++++++++++
 api.meta.md                                   |  480 +++++++
 api.py                                        |  374 ++++++
 .../main/java/de/uka/ilkd/key/proof/Node.java |    1 +
 keyext.api.doc/build.gradle                   |    1 +
 keyext.api.doc/src/main/java/DocGen.java      |  189 +++
 .../src/main/java/ExtractMetaData.java        |  343 +++--
 keyext.api.doc/src/main/java/Metamodel.java   |   93 ++
 keyext.api.doc/src/main/java/PyGen.java       |  136 ++
 keyext.api/build.gradle                       |    6 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |   17 +-
 .../org/keyproject/key/api/NodeTextDesc.java  |    8 -
 .../org/keyproject/key/api/NodeTextId.java    |    6 -
 .../keyproject/key/api/TermActionUtil.java    |    3 +-
 .../key/api/data/KeyIdentifications.java      |    8 +-
 .../org/keyproject/key/api/data/NodeDesc.java |    5 +-
 .../keyproject/key/api/data/NodeTextDesc.java |    9 +
 .../key/api/data/ProblemDefinition.java       |    3 +-
 .../keyproject/key/api/data/TermActionId.java |    2 -
 .../keyproject/key/api/data/TreeNodeId.java   |    2 -
 .../key/api/remoteapi/ExampleApi.java         |    2 +-
 .../key/api/remoteapi/ExampleDesc.java        |   13 +
 .../keyproject/key/api/remoteapi/GoalApi.java |    3 +-
 .../key/api/remoteapi/ServerManagement.java   |    2 +-
 keyext.api/src/main/python/keyapi/rpc.py      |   76 --
 .../java/org/keyproject/key/api/TestRpc.java  |    6 +-
 .../keyapi/__init__.py                        |   11 +-
 keyext.client.python/keyapi/rpc.py            |  200 +++
 .../python => keyext.client.python}/main.py   |    0
 keyext.client.python/rwtest.py                |  402 ++++++
 30 files changed, 3302 insertions(+), 243 deletions(-)
 create mode 100644 api.meta.json
 create mode 100644 api.meta.md
 create mode 100644 api.py
 create mode 100644 keyext.api.doc/src/main/java/DocGen.java
 create mode 100644 keyext.api.doc/src/main/java/Metamodel.java
 create mode 100644 keyext.api.doc/src/main/java/PyGen.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
 delete mode 100644 keyext.api/src/main/python/keyapi/rpc.py
 rename {keyext.api/src/main/python => keyext.client.python}/keyapi/__init__.py (54%)
 create mode 100644 keyext.client.python/keyapi/rpc.py
 rename {keyext.api/src/main/python => keyext.client.python}/main.py (100%)
 create mode 100644 keyext.client.python/rwtest.py

diff --git a/api.meta.json b/api.meta.json
new file mode 100644
index 00000000000..180b16a3019
--- /dev/null
+++ b/api.meta.json
@@ -0,0 +1,1144 @@
+{
+  "endpoints": [
+    {
+      "name": "examples/list",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ExampleDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "meta/version",
+      "documentation": "",
+      "args": [],
+      "returnType": "STRING"
+    },
+    {
+      "name": "meta/available_script_commands",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ProofScriptCommandDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "meta/available_macros",
+      "documentation": "",
+      "args": [],
+      "returnType": {
+        "type": {
+          "typeName": "ProofMacroDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "scriptCommandName",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "server/exit",
+      "documentation": "",
+      "args": []
+    },
+    {
+      "name": "server/shutdown",
+      "documentation": "",
+      "args": [],
+      "returnType": "BOOL"
+    },
+    {
+      "name": "server/setTrace",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "SetTraceParams"
+        }
+      ]
+    },
+    {
+      "name": "proofTree/root",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        }
+      ],
+      "returnType": {
+        "typeName": "TreeNodeDesc",
+        "fields": [],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "proofTree/children",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        },
+        {
+          "name": "arg1",
+          "type": "TreeNodeId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TreeNodeDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "proofTree/subtree",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProofId"
+        },
+        {
+          "name": "arg1",
+          "type": "TreeNodeId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TreeNodeDesc",
+          "fields": [],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/print",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeId"
+        },
+        {
+          "name": "arg1",
+          "type": "PrintOptions"
+        }
+      ],
+      "returnType": {
+        "typeName": "NodeTextDesc",
+        "fields": [
+          {
+            "name": "id",
+            "type": "NodeTextId"
+          },
+          {
+            "name": "result",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/actions",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeTextId"
+        },
+        {
+          "name": "arg1",
+          "type": "INT"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TermActionDesc",
+          "fields": [
+            {
+              "name": "commandId",
+              "type": "TermActionId"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "kind",
+              "type": "TermActionKind"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/apply_action",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "TermActionId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "TermActionDesc",
+          "fields": [
+            {
+              "name": "commandId",
+              "type": "TermActionId"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "description",
+              "type": "STRING"
+            },
+            {
+              "name": "category",
+              "type": "STRING"
+            },
+            {
+              "name": "kind",
+              "type": "TermActionKind"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "goal/free",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "NodeTextId"
+        }
+      ]
+    },
+    {
+      "name": "env/functions",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "FunctionDesc",
+          "fields": [
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "sort",
+              "type": "STRING"
+            },
+            {
+              "name": "retSort",
+              "type": "SortDesc"
+            },
+            {
+              "name": "argSorts",
+              "type": "List"
+            },
+            {
+              "name": "rigid",
+              "type": "BOOL"
+            },
+            {
+              "name": "unique",
+              "type": "BOOL"
+            },
+            {
+              "name": "skolemConstant",
+              "type": "BOOL"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/sorts",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "SortDesc",
+          "fields": [
+            {
+              "name": "string",
+              "type": "STRING"
+            },
+            {
+              "name": "documentation",
+              "type": "STRING"
+            },
+            {
+              "name": "extendsSorts",
+              "type": "List"
+            },
+            {
+              "name": "anAbstract",
+              "type": "BOOL"
+            },
+            {
+              "name": "s",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/contracts",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "EnvironmentId"
+        }
+      ],
+      "returnType": {
+        "type": {
+          "typeName": "ContractDesc",
+          "fields": [
+            {
+              "name": "contractId",
+              "type": "ContractId"
+            },
+            {
+              "name": "name",
+              "type": "STRING"
+            },
+            {
+              "name": "displayName",
+              "type": "STRING"
+            },
+            {
+              "name": "typeName",
+              "type": "STRING"
+            },
+            {
+              "name": "htmlText",
+              "type": "STRING"
+            },
+            {
+              "name": "plainText",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "env/openContract",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ContractId"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/load",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "LoadParams"
+        }
+      ],
+      "returnType": {
+        "a": {
+          "typeName": "EnvironmentId",
+          "fields": [
+            {
+              "name": "envId",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "b": {
+          "typeName": "ProofId",
+          "fields": [
+            {
+              "name": "env",
+              "type": "EnvironmentId"
+            },
+            {
+              "name": "proofId",
+              "type": "STRING"
+            }
+          ],
+          "documentation": ""
+        },
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadKey",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadExample",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadProblem",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ProblemDefinition"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "loading/loadTerm",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ],
+      "returnType": {
+        "typeName": "ProofId",
+        "fields": [
+          {
+            "name": "env",
+            "type": "EnvironmentId"
+          },
+          {
+            "name": "proofId",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "client/sayHello",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "STRING"
+        }
+      ]
+    },
+    {
+      "name": "client/logTrace",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "LogTraceParams"
+        }
+      ]
+    },
+    {
+      "name": "client/sm",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowMessageParams"
+        }
+      ]
+    },
+    {
+      "name": "client/userResponse",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowMessageRequestParams"
+        }
+      ],
+      "returnType": {
+        "typeName": "MessageActionItem",
+        "fields": [
+          {
+            "name": "title",
+            "type": "STRING"
+          }
+        ],
+        "documentation": ""
+      }
+    },
+    {
+      "name": "client/showDocument",
+      "documentation": "",
+      "args": [
+        {
+          "name": "arg0",
+          "type": "ShowDocumentParams"
+        }
+      ],
+      "returnType": {
+        "typeName": "ShowDocumentResult",
+        "fields": [
+          {
+            "name": "success",
+            "type": "BOOL"
+          }
+        ],
+        "documentation": ""
+      }
+    }
+  ],
+  "types": [
+    {
+      "typeName": "ExampleDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofScriptCommandDesc",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofMacroDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "category",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        },
+        {
+          "name": "scriptCommandName",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TraceValue",
+      "values": [
+        "Off",
+        "Message",
+        "All"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "SetTraceParams",
+      "fields": [
+        {
+          "name": "value",
+          "type": "TraceValue"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "EnvironmentId",
+      "fields": [
+        {
+          "name": "envId",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProofId",
+      "fields": [
+        {
+          "name": "env",
+          "type": "EnvironmentId"
+        },
+        {
+          "name": "proofId",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TreeNodeDesc",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "TreeNodeId",
+      "fields": [
+        {
+          "name": "id",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeId",
+      "fields": [
+        {
+          "name": "proofId",
+          "type": "ProofId"
+        },
+        {
+          "name": "nodeId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "PrintOptions",
+      "fields": [
+        {
+          "name": "unicode",
+          "type": "BOOL"
+        },
+        {
+          "name": "width",
+          "type": "INT"
+        },
+        {
+          "name": "indentation",
+          "type": "INT"
+        },
+        {
+          "name": "pure",
+          "type": "BOOL"
+        },
+        {
+          "name": "termLabels",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeTextId",
+      "fields": [
+        {
+          "name": "nodeId",
+          "type": "NodeId"
+        },
+        {
+          "name": "nodeTextId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "NodeTextDesc",
+      "fields": [
+        {
+          "name": "id",
+          "type": "NodeTextId"
+        },
+        {
+          "name": "result",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionId",
+      "fields": [
+        {
+          "name": "nodeId",
+          "type": "NodeId"
+        },
+        {
+          "name": "pio",
+          "type": "STRING"
+        },
+        {
+          "name": "id",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionKind",
+      "values": [
+        "BuiltIn",
+        "Script",
+        "Macro",
+        "Taclet"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TermActionDesc",
+      "fields": [
+        {
+          "name": "commandId",
+          "type": "TermActionId"
+        },
+        {
+          "name": "displayName",
+          "type": "STRING"
+        },
+        {
+          "name": "description",
+          "type": "STRING"
+        },
+        {
+          "name": "category",
+          "type": "STRING"
+        },
+        {
+          "name": "kind",
+          "type": "TermActionKind"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "List",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "SortDesc",
+      "fields": [
+        {
+          "name": "string",
+          "type": "STRING"
+        },
+        {
+          "name": "documentation",
+          "type": "STRING"
+        },
+        {
+          "name": "extendsSorts",
+          "type": "List"
+        },
+        {
+          "name": "anAbstract",
+          "type": "BOOL"
+        },
+        {
+          "name": "s",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "FunctionDesc",
+      "fields": [
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "sort",
+          "type": "STRING"
+        },
+        {
+          "name": "retSort",
+          "type": "SortDesc"
+        },
+        {
+          "name": "argSorts",
+          "type": "List"
+        },
+        {
+          "name": "rigid",
+          "type": "BOOL"
+        },
+        {
+          "name": "unique",
+          "type": "BOOL"
+        },
+        {
+          "name": "skolemConstant",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ContractId",
+      "fields": [
+        {
+          "name": "envId",
+          "type": "EnvironmentId"
+        },
+        {
+          "name": "contractId",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ContractDesc",
+      "fields": [
+        {
+          "name": "contractId",
+          "type": "ContractId"
+        },
+        {
+          "name": "name",
+          "type": "STRING"
+        },
+        {
+          "name": "displayName",
+          "type": "STRING"
+        },
+        {
+          "name": "typeName",
+          "type": "STRING"
+        },
+        {
+          "name": "htmlText",
+          "type": "STRING"
+        },
+        {
+          "name": "plainText",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "LoadParams",
+      "fields": [
+        {
+          "name": "keyFile",
+          "type": "STRING"
+        },
+        {
+          "name": "javaFile",
+          "type": "STRING"
+        },
+        {
+          "name": "classPath",
+          "type": "List"
+        },
+        {
+          "name": "bootClassPath",
+          "type": "STRING"
+        },
+        {
+          "name": "includes",
+          "type": "List"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ProblemDefinition",
+      "fields": [
+        {
+          "name": "sorts",
+          "type": "List"
+        },
+        {
+          "name": "functions",
+          "type": "List"
+        },
+        {
+          "name": "predicates",
+          "type": "List"
+        },
+        {
+          "name": "antecTerms",
+          "type": "List"
+        },
+        {
+          "name": "succTerms",
+          "type": "List"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "LogTraceParams",
+      "fields": [
+        {
+          "name": "messag",
+          "type": "STRING"
+        },
+        {
+          "name": "verbose",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageType",
+      "values": [
+        "Unused",
+        "Error",
+        "Warning",
+        "Info",
+        "Log",
+        "Debug"
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowMessageParams",
+      "fields": [
+        {
+          "name": "type",
+          "type": "MessageType"
+        },
+        {
+          "name": "message",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageActionItem[]",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowMessageRequestParams",
+      "fields": [
+        {
+          "name": "type",
+          "type": "MessageType"
+        },
+        {
+          "name": "message",
+          "type": "STRING"
+        },
+        {
+          "name": "actions",
+          "type": "MessageActionItem[]"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "MessageActionItem",
+      "fields": [
+        {
+          "name": "title",
+          "type": "STRING"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "Range",
+      "fields": [
+        {
+          "name": "start",
+          "type": "INT"
+        },
+        {
+          "name": "end",
+          "type": "INT"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowDocumentParams",
+      "fields": [
+        {
+          "name": "uri",
+          "type": "STRING"
+        },
+        {
+          "name": "external",
+          "type": "BOOL"
+        },
+        {
+          "name": "takeFocus",
+          "type": "BOOL"
+        },
+        {
+          "name": "selection",
+          "type": "Range"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "ShowDocumentResult",
+      "fields": [
+        {
+          "name": "success",
+          "type": "BOOL"
+        }
+      ],
+      "documentation": ""
+    },
+    {
+      "typeName": "TaskFinishedInfo",
+      "fields": [],
+      "documentation": ""
+    },
+    {
+      "typeName": "TaskStartedInfo",
+      "fields": [],
+      "documentation": ""
+    }
+  ]
+}
\ No newline at end of file
diff --git a/api.meta.md b/api.meta.md
new file mode 100644
index 00000000000..f53d88619f3
--- /dev/null
+++ b/api.meta.md
@@ -0,0 +1,480 @@
+## Types
+### Type: ContractDesc
+```
+type ContractDesc {
+ 	contractId : ContractId
+	displayName : STRING
+	htmlText : STRING
+	name : STRING
+	plainText : STRING
+	typeName : STRING
+}
+```
+
+### Type: ContractId
+```
+type ContractId {
+ 	contractId : INT
+	envId : EnvironmentId
+}
+```
+
+### Type: EnvironmentId
+```
+type EnvironmentId {
+ 	envId : STRING
+}
+```
+
+### Type: ExampleDesc
+```
+type ExampleDesc {
+ 	description : STRING
+	name : STRING
+}
+```
+
+### Type: FunctionDesc
+```
+type FunctionDesc {
+ 	argSorts : List
+	name : STRING
+	retSort : SortDesc
+	rigid : BOOL
+	skolemConstant : BOOL
+	sort : STRING
+	unique : BOOL
+}
+```
+
+### Type: List
+```
+type List {
+ 
+}
+```
+
+### Type: LoadParams
+```
+type LoadParams {
+ 	bootClassPath : STRING
+	classPath : List
+	includes : List
+	javaFile : STRING
+	keyFile : STRING
+}
+```
+
+### Type: LogTraceParams
+```
+type LogTraceParams {
+ 	messag : STRING
+	verbose : STRING
+}
+```
+
+### Type: MessageActionItem
+```
+type MessageActionItem {
+ 	title : STRING
+}
+```
+
+### Type: MessageActionItem[]
+```
+type MessageActionItem[] {
+ 
+}
+```
+
+### Type: MessageType
+```
+enum MessageType { Unused, Error, Warning, Info, Log, Debug }
+```
+
+### Type: NodeId
+```
+type NodeId {
+ 	nodeId : INT
+	proofId : ProofId
+}
+```
+
+### Type: NodeTextDesc
+```
+type NodeTextDesc {
+ 	id : NodeTextId
+	result : STRING
+}
+```
+
+### Type: NodeTextId
+```
+type NodeTextId {
+ 	nodeId : NodeId
+	nodeTextId : INT
+}
+```
+
+### Type: PrintOptions
+```
+type PrintOptions {
+ 	indentation : INT
+	pure : BOOL
+	termLabels : BOOL
+	unicode : BOOL
+	width : INT
+}
+```
+
+### Type: ProblemDefinition
+```
+type ProblemDefinition {
+ 	antecTerms : List
+	functions : List
+	predicates : List
+	sorts : List
+	succTerms : List
+}
+```
+
+### Type: ProofId
+```
+type ProofId {
+ 	env : EnvironmentId
+	proofId : STRING
+}
+```
+
+### Type: ProofMacroDesc
+```
+type ProofMacroDesc {
+ 	category : STRING
+	description : STRING
+	name : STRING
+	scriptCommandName : STRING
+}
+```
+
+### Type: ProofScriptCommandDesc
+```
+type ProofScriptCommandDesc {
+ 
+}
+```
+
+### Type: Range
+```
+type Range {
+ 	end : INT
+	start : INT
+}
+```
+
+### Type: SetTraceParams
+```
+type SetTraceParams {
+ 	value : TraceValue
+}
+```
+
+### Type: ShowDocumentParams
+```
+type ShowDocumentParams {
+ 	external : BOOL
+	selection : Range
+	takeFocus : BOOL
+	uri : STRING
+}
+```
+
+### Type: ShowDocumentResult
+```
+type ShowDocumentResult {
+ 	success : BOOL
+}
+```
+
+### Type: ShowMessageParams
+```
+type ShowMessageParams {
+ 	message : STRING
+	type : MessageType
+}
+```
+
+### Type: ShowMessageRequestParams
+```
+type ShowMessageRequestParams {
+ 	actions : MessageActionItem[]
+	message : STRING
+	type : MessageType
+}
+```
+
+### Type: SortDesc
+```
+type SortDesc {
+ 	anAbstract : BOOL
+	documentation : STRING
+	extendsSorts : List
+	s : STRING
+	string : STRING
+}
+```
+
+### Type: TaskFinishedInfo
+```
+type TaskFinishedInfo {
+ 
+}
+```
+
+### Type: TaskStartedInfo
+```
+type TaskStartedInfo {
+ 
+}
+```
+
+### Type: TermActionDesc
+```
+type TermActionDesc {
+ 	category : STRING
+	commandId : TermActionId
+	description : STRING
+	displayName : STRING
+	kind : TermActionKind
+}
+```
+
+### Type: TermActionId
+```
+type TermActionId {
+ 	id : STRING
+	nodeId : NodeId
+	pio : STRING
+}
+```
+
+### Type: TermActionKind
+```
+enum TermActionKind { BuiltIn, Script, Macro, Taclet }
+```
+
+### Type: TraceValue
+```
+enum TraceValue { Off, Message, All }
+```
+
+### Type: TreeNodeDesc
+```
+type TreeNodeDesc {
+ 
+}
+```
+
+### Type: TreeNodeId
+```
+type TreeNodeId {
+ 	id : STRING
+}
+```
+
+## Endpoints
+### client/logTrace (`server ~~> client`) 
+
+```
+Client.client/logTrace( arg0 : LogTraceParams ) **async**
+```
+
+
+### client/sayHello (`server ~~> client`) 
+
+```
+Client.client/sayHello( arg0 : STRING ) **async**
+```
+
+
+### client/showDocument (`server -> client`) 
+
+```
+Client.client/showDocument( arg0 : ShowDocumentParams ) -> ShowDocumentResult
+```
+
+
+### client/sm (`server ~~> client`) 
+
+```
+Client.client/sm( arg0 : ShowMessageParams ) **async**
+```
+
+
+### client/userResponse (`server -> client`) 
+
+```
+Client.client/userResponse( arg0 : ShowMessageRequestParams ) -> MessageActionItem
+```
+
+
+### env/contracts (`client -> server`) 
+
+```
+Server.env/contracts( arg0 : EnvironmentId ) -> ContractDesc[]
+```
+
+
+### env/functions (`client -> server`) 
+
+```
+Server.env/functions( arg0 : EnvironmentId ) -> FunctionDesc[]
+```
+
+
+### env/openContract (`client -> server`) 
+
+```
+Server.env/openContract( arg0 : ContractId ) -> ProofId
+```
+
+
+### env/sorts (`client -> server`) 
+
+```
+Server.env/sorts( arg0 : EnvironmentId ) -> SortDesc[]
+```
+
+
+### examples/list (`client -> server`) 
+
+```
+Server.examples/list(  ) -> ExampleDesc[]
+```
+
+
+### goal/actions (`client -> server`) 
+
+```
+Server.goal/actions( arg0 : NodeTextId, arg1 : INT ) -> TermActionDesc[]
+```
+
+
+### goal/apply_action (`client -> server`) 
+
+```
+Server.goal/apply_action( arg0 : TermActionId ) -> TermActionDesc[]
+```
+
+
+### goal/free (`client ~~> server`) 
+
+```
+Server.goal/free( arg0 : NodeTextId ) **async**
+```
+
+
+### goal/print (`client -> server`) 
+
+```
+Server.goal/print( arg0 : NodeId, arg1 : PrintOptions ) -> NodeTextDesc
+```
+
+
+### loading/load (`client -> server`) 
+
+```
+Server.loading/load( arg0 : LoadParams ) -> either<a,b>
+```
+
+
+### loading/loadExample (`client -> server`) 
+
+```
+Server.loading/loadExample( arg0 : STRING ) -> ProofId
+```
+
+
+### loading/loadKey (`client -> server`) 
+
+```
+Server.loading/loadKey( arg0 : STRING ) -> ProofId
+```
+
+
+### loading/loadProblem (`client -> server`) 
+
+```
+Server.loading/loadProblem( arg0 : ProblemDefinition ) -> ProofId
+```
+
+
+### loading/loadTerm (`client -> server`) 
+
+```
+Server.loading/loadTerm( arg0 : STRING ) -> ProofId
+```
+
+
+### meta/available_macros (`client -> server`) 
+
+```
+Server.meta/available_macros(  ) -> ProofMacroDesc[]
+```
+
+
+### meta/available_script_commands (`client -> server`) 
+
+```
+Server.meta/available_script_commands(  ) -> ProofScriptCommandDesc[]
+```
+
+
+### meta/version (`client -> server`) 
+
+```
+Server.meta/version(  ) -> STRING
+```
+
+
+### proofTree/children (`client -> server`) 
+
+```
+Server.proofTree/children( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+```
+
+
+### proofTree/root (`client -> server`) 
+
+```
+Server.proofTree/root( arg0 : ProofId ) -> TreeNodeDesc
+```
+
+
+### proofTree/subtree (`client -> server`) 
+
+```
+Server.proofTree/subtree( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+```
+
+
+### server/exit (`client ~~> server`) 
+
+```
+Server.server/exit(  ) **async**
+```
+
+
+### server/setTrace (`client ~~> server`) 
+
+```
+Server.server/setTrace( arg0 : SetTraceParams ) **async**
+```
+
+
+### server/shutdown (`client -> server`) 
+
+```
+Server.server/shutdown(  ) -> BOOL
+```
+
+
diff --git a/api.py b/api.py
new file mode 100644
index 00000000000..c83050a763e
--- /dev/null
+++ b/api.py
@@ -0,0 +1,374 @@
+import enum
+import abc
+import typing
+class ExampleDesc:
+    """"""
+
+    name : str
+    description : str
+
+class ProofScriptCommandDesc:
+    """"""
+
+
+class ProofMacroDesc:
+    """"""
+
+    name : str
+    category : str
+    description : str
+    scriptCommandName : str
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+class SetTraceParams:
+    """"""
+
+    value : TraceValue
+
+class EnvironmentId:
+    """"""
+
+    envId : str
+
+class ProofId:
+    """"""
+
+    env : EnvironmentId
+    proofId : str
+
+class TreeNodeDesc:
+    """"""
+
+
+class TreeNodeId:
+    """"""
+
+    id : str
+
+class NodeId:
+    """"""
+
+    proofId : ProofId
+    nodeId : int
+
+class PrintOptions:
+    """"""
+
+    unicode : bool
+    width : int
+    indentation : int
+    pure : bool
+    termLabels : bool
+
+class NodeTextId:
+    """"""
+
+    nodeId : NodeId
+    nodeTextId : int
+
+class NodeTextDesc:
+    """"""
+
+    id : NodeTextId
+    result : str
+
+class TermActionId:
+    """"""
+
+    nodeId : NodeId
+    pio : str
+    id : str
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+class TermActionDesc:
+    """"""
+
+    commandId : TermActionId
+    displayName : str
+    description : str
+    category : str
+    kind : TermActionKind
+
+class List:
+    """"""
+
+
+class SortDesc:
+    """"""
+
+    string : str
+    documentation : str
+    extendsSorts : List
+    anAbstract : bool
+    s : str
+
+class FunctionDesc:
+    """"""
+
+    name : str
+    sort : str
+    retSort : SortDesc
+    argSorts : List
+    rigid : bool
+    unique : bool
+    skolemConstant : bool
+
+class ContractId:
+    """"""
+
+    envId : EnvironmentId
+    contractId : int
+
+class ContractDesc:
+    """"""
+
+    contractId : ContractId
+    name : str
+    displayName : str
+    typeName : str
+    htmlText : str
+    plainText : str
+
+class LoadParams:
+    """"""
+
+    keyFile : str
+    javaFile : str
+    classPath : List
+    bootClassPath : str
+    includes : List
+
+class ProblemDefinition:
+    """"""
+
+    sorts : List
+    functions : List
+    predicates : List
+    antecTerms : List
+    succTerms : List
+
+class LogTraceParams:
+    """"""
+
+    messag : str
+    verbose : str
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+class ShowMessageParams:
+    """"""
+
+    type : MessageType
+    message : str
+
+class MessageActionItem[]:
+    """"""
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type : MessageType
+    message : str
+    actions : MessageActionItem[]
+
+class MessageActionItem:
+    """"""
+
+    title : str
+
+class Range:
+    """"""
+
+    start : int
+    end : int
+
+class ShowDocumentParams:
+    """"""
+
+    uri : str
+    external : bool
+    takeFocus : bool
+    selection : Range
+
+class ShowDocumentResult:
+    """"""
+
+    success : bool
+
+class TaskFinishedInfo:
+    """"""
+
+
+class TaskStartedInfo:
+    """"""
+
+
+class KeyServer():
+    def env_contracts(self, arg0 : EnvironmentId) -> typing.List[ContractDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/contracts", )
+
+    def env_functions(self, arg0 : EnvironmentId) -> typing.List[FunctionDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/functions", )
+
+    def env_openContract(self, arg0 : ContractId) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("env/openContract", )
+
+    def env_sorts(self, arg0 : EnvironmentId) -> typing.List[SortDesc]:
+       """"""
+
+       return self.rpc.call_sync("env/sorts", )
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+       """"""
+
+       return self.rpc.call_sync("examples/list", )
+
+    def goal_actions(self, arg0 : NodeTextId, arg1 : int) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self.rpc.call_sync("goal/actions", )
+
+    def goal_apply_action(self, arg0 : TermActionId) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self.rpc.call_sync("goal/apply_action", )
+
+    def goal_free(self, arg0 : NodeTextId):
+        """"""
+
+        return self.rpc.call_async("goal/free", )
+
+    def goal_print(self, arg0 : NodeId, arg1 : PrintOptions) -> NodeTextDesc:
+       """"""
+
+       return self.rpc.call_sync("goal/print", )
+
+    def loading_load(self, arg0 : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+       """"""
+
+       return self.rpc.call_sync("loading/load", )
+
+    def loading_loadExample(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadExample", )
+
+    def loading_loadKey(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadKey", )
+
+    def loading_loadProblem(self, arg0 : ProblemDefinition) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadProblem", )
+
+    def loading_loadTerm(self, arg0 : str) -> ProofId:
+       """"""
+
+       return self.rpc.call_sync("loading/loadTerm", )
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+       """"""
+
+       return self.rpc.call_sync("meta/available_macros", )
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+       """"""
+
+       return self.rpc.call_sync("meta/available_script_commands", )
+
+    def meta_version(self, ) -> STRING:
+       """"""
+
+       return self.rpc.call_sync("meta/version", )
+
+    def proofTree_children(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self.rpc.call_sync("proofTree/children", )
+
+    def proofTree_root(self, arg0 : ProofId) -> TreeNodeDesc:
+       """"""
+
+       return self.rpc.call_sync("proofTree/root", )
+
+    def proofTree_subtree(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self.rpc.call_sync("proofTree/subtree", )
+
+    def server_exit(self, ):
+        """"""
+
+        return self.rpc.call_async("server/exit", )
+
+    def server_setTrace(self, arg0 : SetTraceParams):
+        """"""
+
+        return self.rpc.call_async("server/setTrace", )
+
+    def server_shutdown(self, ) -> BOOL:
+       """"""
+
+       return self.rpc.call_sync("server/shutdown", )
+
+class Client(abc.AbcMeta):
+    @abstractmethod
+    def client_logTrace(self, arg0 : LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, arg0 : str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, arg0 : ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, arg0 : ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, arg0 : ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
+
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 06da529607f..95ba46fe7be 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -12,6 +12,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.stream.Stream;
 
 import de.uka.ilkd.key.logic.RenamingTable;
 import de.uka.ilkd.key.logic.Sequent;
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index f7aadd6467c..84a1789e01f 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    implementation(project(":keyext.api"))
     implementation("com.github.javaparser:javaparser-core:3.25.5")
     implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.5")
 }
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/DocGen.java b/keyext.api.doc/src/main/java/DocGen.java
new file mode 100644
index 00000000000..36aed393607
--- /dev/null
+++ b/keyext.api.doc/src/main/java/DocGen.java
@@ -0,0 +1,189 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class DocGen implements Supplier<String> {
+    private final Metamodel.KeyApi metamodel;
+    private PrintWriter out;
+    private final StringWriter target = new StringWriter();
+
+    public DocGen(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+            printHeader();
+
+            out.format("## Types%n");
+            metamodel.types()
+                    .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                    .forEach(this::printType);
+
+            out.format("## Endpoints%n");
+            metamodel.endpoints()
+                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                    .forEach(this::endpoints);
+            printFooter();
+        }
+        return target.toString();
+    }
+
+    private void printFooter() {
+
+    }
+
+    private void printHeader() {
+
+
+    }
+
+    private void endpoints(Metamodel.Endpoint endpoint) {
+        //out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        //out.println(getJavaDoc(typeDeclaration));
+        //out.println("\n");
+
+        var direction = "";
+        if (endpoint instanceof Metamodel.ServerRequest sr)
+            direction = "client -> server";
+        else if (endpoint instanceof Metamodel.ClientRequest sr)
+            direction = "server -> client";
+        else if (endpoint instanceof Metamodel.ServerNotification sr)
+            direction = "client ~~> server";
+        else if (endpoint instanceof Metamodel.ClientNotification sr)
+            direction = "server ~~> client";
+
+        out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
+        out.format("```%n");
+        var args = endpoint.args();
+        final var a = args.stream()
+                .map(it -> "%s : %s".formatted(it.name(), it.type()))
+                .collect(Collectors.joining(", "));
+        if (endpoint instanceof Metamodel.ServerRequest sr) {
+            out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        } else if (endpoint instanceof Metamodel.ClientRequest sr)
+            out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        else if (endpoint instanceof Metamodel.ServerNotification sr)
+            out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+        else if (endpoint instanceof Metamodel.ClientNotification sr)
+            out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+        out.format("```%n");
+
+        out.println(endpoint.documentation());
+        out.println();
+    }
+
+    private void printType(Metamodel.Type type) {
+        out.format("### Type: %s%n", type.name());
+        if (type instanceof Metamodel.ObjectType ot) {
+            out.format("""
+                    ```
+                    type %s {
+                     %s
+                    }
+                    ```
+                    """.formatted(type.name(),
+                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                            .collect(Collectors.joining("\n"))));
+        }
+
+        if (type instanceof Metamodel.EnumType et) {
+            out.format("""
+                    ```
+                    enum %s { %s }
+                    ```
+                    """.formatted(type.name(), String.join(", ", et.values())
+            ));
+            out.format(type.documentation());
+        }
+        out.format(type.documentation());
+        out.println();
+    }
+
+        /*
+        private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
+            var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+                            () -> m.getAnnotationByName("JsonRequest"))
+                    .orElseThrow();
+
+            var segment = getJsonSegment(td) + "/";
+            String name = "";
+
+            if (annotationExpr.isMarkerAnnotationExpr()) {
+                name = m.getNameAsString();
+            } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+                var sma = annotationExpr.asSingleMemberAnnotationExpr();
+                name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+            } else {
+                var ne = annotationExpr.asNormalAnnotationExpr();
+                for (MemberValuePair pair : ne.getPairs()) {
+                    switch (pair.getName().asString()) {
+                        case "value":
+                            name = pair.getValue().asLiteralStringValueExpr().getValue();
+                            break;
+                        case "useSegment":
+                            if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+                                segment = "";
+                            }
+                    }
+                }
+            }
+            return segment + name;
+        }
+
+        @Nonnull
+        private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
+            if (typeDeclaration.getJavadoc().isPresent()) {
+                final var javadoc = typeDeclaration.getJavadoc().get();
+                return javadoc.getDescription().toText()
+                        + "\n\n"
+                        + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+                        .collect(Collectors.joining("\n"));
+            }
+            return "";
+        }
+
+        private static String type (MethodDeclaration method){
+            if (method.getAnnotationByName("JsonNotification").isPresent())
+                return "notification";
+            if (method.getAnnotationByName("JsonRequest").isPresent())
+                return "request";
+            return "";
+        }
+
+        private static boolean isExported (MethodDeclaration method){
+            return method.getAnnotationByName("JsonNotification").isPresent()
+                    || method.getAnnotationByName("JsonRequest").isPresent();
+        }
+
+        private void printHeader () {
+            out.format("# KeY-API%n%n");
+        }
+
+        private void printFooter () {
+        }
+
+
+    /*
+    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+        return it.getAnnotationByName("JsonSegment").isPresent();
+    }
+
+    private static String getJsonSegment(TypeDeclaration<?> it) {
+        var ae = it.getAnnotationByName("JsonSegment").get();
+        return ae.asSingleMemberAnnotationExpr().getMemberValue()
+                .asLiteralStringValueExpr().getValue();
+    }
+     */
+
+}
+
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index a9df59adef8..2855e390f75 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -1,25 +1,27 @@
-import com.github.javaparser.ParseResult;
+import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.body.TypeDeclaration;
-import com.github.javaparser.ast.expr.MemberValuePair;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
-import com.github.javaparser.javadoc.JavadocBlockTag;
-import com.github.javaparser.resolution.SymbolResolver;
-import com.github.javaparser.resolution.TypeSolver;
-import com.github.javaparser.symbolsolver.JavaSymbolSolver;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.TypeSolverBuilder;
-import com.github.javaparser.utils.SourceRoot;
-
-import javax.annotation.Nonnull;
-import java.io.FileWriter;
+import com.google.gson.*;
+import de.uka.ilkd.key.proof.Proof;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
+import sun.misc.Unsafe;
+
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author Alexander Weigl
@@ -28,135 +30,250 @@
 public class ExtractMetaData {
     private static PrintWriter out;
 
-    public static void main(String[] args) throws IOException {
-        System.out.println("XXX" + Arrays.toString(args));
-        ParserConfiguration config = new ParserConfiguration();
-        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
-        /*config.setAttributeComments(true);
-        config.setLexicalPreservationEnabled(false);
-        config.setStoreTokens(false);
-        config.setIgnoreAnnotationsWhenAttributingComments(true);
-        config.setDoNotAssignCommentsPrecedingEmptyLines(true);*/
-        //var root = Paths.get(args[0]);
-        TypeSolver typeSolver = new TypeSolverBuilder()
-                .withSourceCode("keyext.api/src/main/java")
-                .withSourceCode("key.core/src/main/java")
-                .withSourceCode("key.util/src/main/java")
-                .withCurrentJRE()
-                .build();
-        SymbolResolver symbolResolver = new JavaSymbolSolver(typeSolver);
-        config.setSymbolResolver(symbolResolver);
-        var source = new SourceRoot(Paths.get("keyext.api", "src", "main", "java"), config);
-        var cu = source.tryToParse();
-        var jsonSegment = Comparator.comparing(ExtractMetaData::getJsonSegment);
-        var segments = cu.stream().filter(ParseResult::isSuccessful)
-                .filter(it -> it.getResult().get().getPrimaryType().isPresent())
-                .map(it -> it.getResult().get().getPrimaryType().get())
-                .filter(ExtractMetaData::hasJsonSegment)
-                .sorted(jsonSegment)
-                .toList();
+    private static final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
+    private static final List<Metamodel.Type> types = new LinkedList<>();
+    private static final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
 
-        try (var out = new PrintWriter(new FileWriter("doc.md"))) {
-            ExtractMetaData.out = out;
-            printHeader(segments);
-            segments.forEach(ExtractMetaData::printDocumentation);
-            printFooter(segments);
+    public static void main(String[] args) {
+        for (Method method : KeyApi.class.getMethods()) {
+            addServerEndpoint(method);
         }
 
-        // "org.keyproject.key.api.remoteapi.KeyApi";
+        for (Method method : ClientApi.class.getMethods()) {
+            addClientEndpoint(method);
+        }
+
+        try {
+            Files.writeString(Paths.get("api.meta.json"), getGson().toJson(keyApi));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            var n = new DocGen(keyApi);
+            Files.writeString(Paths.get("api.meta.md"), n.get());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            var n = new PyGen(keyApi);
+            Files.writeString(Paths.get("api.py"), n.get());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
-    private static void printDocumentation(TypeDeclaration<?> typeDeclaration) {
-        out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
-        out.println(getJavaDoc(typeDeclaration));
-        out.println("\n");
+    private static Gson getGson() {
+        return new GsonBuilder()
+                .setPrettyPrinting()
+                .registerTypeAdapter(Type.class, new JsonSerializer<Metamodel.Type>() {
+                    @Override
+                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializationContext context) {
+                        JsonObject json = (JsonObject) context.serialize(src);
+                        json.addProperty("kind", src.kind());
+                        return json;
+                    }
+                })
+                .create();
+    }
 
-        for (MethodDeclaration method : typeDeclaration.getMethods()) {
-            if (!isExported(method)) continue;
+    private static void addServerEndpoint(Method method) {
+        var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
+        if (jsonSegment == null) return;
+        var segment = jsonSegment.value();
 
-            String callName = getCallName(method, typeDeclaration);
+        var req = method.getAnnotation(JsonRequest.class);
+        var resp = method.getAnnotation(JsonNotification.class);
 
-            out.format("### %s (type: %s) %n%n", callName, type(method));
+        var args = translate(method.getParameters());
 
-            out.println(getJavaDoc(method));
+        if (req != null) {
+            var mn = callMethodName(method.getName(), segment, req.value(), req.useSegment());
 
-            out.println();
+            if (method.getReturnType() == Void.class) {
+                System.err.println("Found void as return type for a request!  " + method);
+                return;
+            }
+
+            var retType = getOrFindType(method.getGenericReturnType());
+            Objects.requireNonNull(retType, "No retType found " + method.getGenericReturnType());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ServerRequest(mn, documentation, args, retType);
+            endpoints.add(mm);
+            return;
+        }
+
+        if (resp != null) {
+            var mn = callMethodName(method.getName(), segment, resp.value(), resp.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ServerNotification(mn, documentation, args);
+            endpoints.add(mm);
+            return;
         }
+
+        throw new IllegalStateException();
     }
 
-    private static String getCallName(MethodDeclaration m, TypeDeclaration<?> td) {
-        var annotationExpr = m.getAnnotationByName("JsonNotification").or(
-                        () -> m.getAnnotationByName("JsonRequest"))
-                .orElseThrow();
+    private static String findDocumentation(Method method) {
+        // TODO get compilation, get type, find method, getJavaDocComment()
+        return "";
+    }
 
-        var segment = getJsonSegment(td) + "/";
-        String name = "";
+    private static List<Metamodel.Argument> translate(Parameter[] parameters) {
+        return Arrays.stream(parameters).map(ExtractMetaData::translate).toList();
+    }
 
-        if (annotationExpr.isMarkerAnnotationExpr()) {
-            name = m.getNameAsString();
-        } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
-            var sma = annotationExpr.asSingleMemberAnnotationExpr();
-            name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
-        } else {
-            var ne = annotationExpr.asNormalAnnotationExpr();
-            for (MemberValuePair pair : ne.getPairs()) {
-                switch (pair.getName().asString()) {
-                    case "value":
-                        name = pair.getValue().asLiteralStringValueExpr().getValue();
-                        break;
-                    case "useSegment":
-                        if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
-                            segment = "";
-                        }
-                }
-            }
-        }
-        return segment + name;
+    private static Metamodel.Argument translate(Parameter parameter) {
+        var type =  getOrFindType(parameter.getType()).name();
+        return new Metamodel.Argument(parameter.getName(), type);
     }
 
+    private static Metamodel.Type getOrFindType(Class<?> type) {
+        System.out.println(type);
+        if (type == CompletableFuture.class) {
+            return getOrFindType(type.getTypeParameters()[0].getClass());
+        }
 
-    @Nonnull
-    private static String getJavaDoc(NodeWithJavadoc<?> typeDeclaration) {
-        if (typeDeclaration.getJavadoc().isPresent()) {
-            final var javadoc = typeDeclaration.getJavadoc().get();
-            return javadoc.getDescription().toText()
-                    + "\n\n"
-                    + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
-                    .collect(Collectors.joining("\n"));
+        if (type == Unsafe.class || type == Class.class || type == Constructor.class || type == Proof.class) {
+            throw new IllegalStateException("Forbidden class reached!");
         }
-        return "";
+
+        if (type == String.class) return Metamodel.BuiltinType.STRING;
+        if (type == Integer.class) return Metamodel.BuiltinType.INT;
+        if (type == Double.class) return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.class) return Metamodel.BuiltinType.LONG;
+        if (type == Character.class) return Metamodel.BuiltinType.LONG;
+        if (type == File.class) return Metamodel.BuiltinType.STRING;
+        if (type == Boolean.class) return Metamodel.BuiltinType.BOOL;
+        if (type == Boolean.TYPE) return Metamodel.BuiltinType.BOOL;
+
+        if (type == Integer.TYPE) return Metamodel.BuiltinType.INT;
+        if (type == Double.TYPE) return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.TYPE) return Metamodel.BuiltinType.LONG;
+        if (type == Character.TYPE) return Metamodel.BuiltinType.LONG;
+
+        System.out.println(type);
+        var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
+        if (t.isPresent()) return t.get();
+        var a = createType(type);
+        types.add(a);
+        return a;
     }
 
-    private static String type(MethodDeclaration method) {
-        if (method.getAnnotationByName("JsonNotification").isPresent())
-            return "notification";
-        if (method.getAnnotationByName("JsonRequest").isPresent())
-            return "request";
-        return "";
+    private static Metamodel.Type createType(Class<?> type) {
+        final var documentation = findDocumentation(type);
+        if (type.isEnum())
+            return new Metamodel.EnumType(type.getSimpleName(),
+                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                    documentation);
+
+
+        var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
+        final var list = Arrays.stream(type.getDeclaredFields())
+                .map(it -> new Metamodel.Field(it.getName(), getOrFindType(it.getType()).name()))
+                .toList();
+        obj.fields().addAll(list);
+        return obj;
     }
 
-    private static boolean isExported(MethodDeclaration method) {
-        return method.getAnnotationByName("JsonNotification").isPresent()
-                || method.getAnnotationByName("JsonRequest").isPresent();
+    private static String findDocumentation(Class<?> type) {
+        var parser = initJavaParser();
+        var fileName = findFileForType(type);
+
+        if (Files.exists(fileName)) {
+            try {
+                return parser.parse(fileName).getResult().flatMap(CompilationUnit::getPrimaryType)
+                        .flatMap(NodeWithJavadoc::getJavadocComment)
+                        .map(Comment::getContent).orElse("");
+            } catch (IOException e) {
+                e.printStackTrace();
+                return "";
+            }
+        } else return "";
     }
 
-    private static void printHeader(List<? extends TypeDeclaration<?>> segments) {
-        out.format("# KeY-API%n%n");
+    private static Path findFileForType(Class<?> type) {
+        final var folderString = type.getPackageName().replaceAll("\\.", "/");
+        var folder = Paths.get("keyext.api", "src", "main", "java", folderString);
+        final Class<?> declaringClass = type.getDeclaringClass();
+        var fileName = (declaringClass != null ? declaringClass : type).getSimpleName() + ".java";
+        var file = folder.resolve(fileName);
+        return file;
     }
 
-    private static void printFooter(List<? extends TypeDeclaration<?>> segments) {
 
+    private static void addClientEndpoint(Method method) {
+        var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
+        var segment = jsonSegment.value();
+
+        var req = method.getAnnotation(JsonRequest.class);
+        var resp = method.getAnnotation(JsonNotification.class);
+
+        var args = translate(method.getParameters());
+
+        if (req != null) {
+            var retType = getOrFindType(method.getGenericReturnType());
+            Objects.requireNonNull(retType);
+            var mn = callMethodName(method.getName(), segment, req.value(), req.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ClientRequest(mn, documentation, args, retType);
+            endpoints.add(mm);
+            return;
+        }
+
+        if (resp != null) {
+            var mn = callMethodName(method.getName(), segment, resp.value(), resp.useSegment());
+            var documentation = findDocumentation(method);
+            var mm = new Metamodel.ClientNotification(mn, documentation, args);
+            endpoints.add(mm);
+        }
+    }
 
+    private static String callMethodName(String method, String segment, String userValue, boolean useSegment) {
+        if (!useSegment) {
+            if (userValue == null || userValue.isBlank()) {
+                return method;
+            } else {
+                return userValue;
+            }
+        } else {
+            if (userValue == null || userValue.isBlank()) {
+                return segment + "/" + method;
+            } else {
+                return segment + "/" + userValue;
+            }
+        }
     }
 
+    private static Metamodel.Type getOrFindType(Type genericReturnType) {
+        if (genericReturnType instanceof Class c) return getOrFindType(c);
+        if (genericReturnType instanceof ParameterizedType pt) {
+            if (Objects.equals(pt.getRawType().getTypeName(), CompletableFuture.class.getTypeName())) {
+                return getOrFindType(pt.getActualTypeArguments()[0]);
+            }
+            if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
+                var base = getOrFindType(pt.getActualTypeArguments()[0]);
+                return new Metamodel.ListType(base, "");
+            }
 
-    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
-        return it.getAnnotationByName("JsonSegment").isPresent();
+            if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
+                var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
+                var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
+                return new Metamodel.EitherType(base1, base2, "");
+            }
+        }
+        return null;
     }
 
-    private static String getJsonSegment(TypeDeclaration<?> it) {
-        var ae = it.getAnnotationByName("JsonSegment").get();
-        return ae.asSingleMemberAnnotationExpr().getMemberValue()
-                .asLiteralStringValueExpr().getValue();
+    static JavaParser initJavaParser() {
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
+        config.setAttributeComments(true);
+        config.setLexicalPreservationEnabled(false);
+        config.setStoreTokens(false);
+        config.setIgnoreAnnotationsWhenAttributingComments(true);
+        config.setDoNotAssignCommentsPrecedingEmptyLines(true);
+        return new JavaParser(config);
     }
+
 }
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
new file mode 100644
index 00000000000..833699cfe0c
--- /dev/null
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -0,0 +1,93 @@
+import org.jspecify.annotations.NullMarked;
+
+import java.util.List;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+@NullMarked
+public class Metamodel {
+    public record KeyApi(
+            List<Endpoint> endpoints,
+            List<Type> types
+    ) {
+    }
+
+    sealed interface Endpoint {
+        String name();
+
+        String documentation();
+
+        default String kind() {
+            return getClass().getSimpleName();
+        }
+
+        List<Argument> args();
+    }
+
+    public record Argument(String name, String type) {
+    }
+
+    record ServerRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    }
+
+    record ServerNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    }
+
+    record ClientRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    }
+
+    record ClientNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    }
+
+    record Field(String name, /*Type*/ String type) {
+    }
+
+    sealed interface Type {
+        default String kind() {
+            return getClass().getSimpleName();
+        }
+
+        String documentation();
+
+        String name();
+    }
+
+    enum BuiltinType implements Type {
+        INT, LONG, STRING, BOOL, DOUBLE;
+
+        @Override
+        public String documentation() {
+            return "built-in data type";
+        }
+    }
+
+    record ListType(Type type, String documentation) implements Type {
+        @Override
+        public String name() {
+            return type().name() + "[]";
+        }
+    }
+
+    record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
+        @Override
+        public String name() {
+            return typeName;
+        }
+    }
+
+    public record EitherType(Type a, Type b, String documentation) implements Type {
+        @Override
+        public String name() {
+            return "either<a,b>";
+        }
+    }
+
+    public record EnumType(String typeName, List<String> values, String documentation) implements Type {
+        @Override
+        public String name() {
+            return typeName;
+        }
+    }
+}
diff --git a/keyext.api.doc/src/main/java/PyGen.java b/keyext.api.doc/src/main/java/PyGen.java
new file mode 100644
index 00000000000..357c2f51e8d
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PyGen.java
@@ -0,0 +1,136 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class PyGen implements Supplier<String> {
+    private final Metamodel.KeyApi metamodel;
+    private PrintWriter out;
+    private final StringWriter target = new StringWriter();
+
+    public PyGen(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+
+            out.format("""
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod                    
+                    """);
+
+            metamodel.types().forEach(this::printType);
+            server(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+            client(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+        }
+        return target.toString();
+    }
+
+    private void client(Stream<Metamodel.Endpoint> sorted) {
+        out.format("class Client(abc.AbcMeta):%n");
+        sorted.forEach(this::clientEndpoint);
+    }
+
+    private void clientEndpoint(Metamodel.Endpoint endpoint) {
+        var args = endpoint.args().stream()
+                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                .collect(Collectors.joining(", "));
+        out.format("    @abstractmethod%n");
+        if (endpoint instanceof Metamodel.ClientRequest sr) {
+            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args, asPython(sr.returnType()));
+        } else {
+            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+        }
+        out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+        out.format("        pass".formatted(endpoint.name(), ""));
+        out.println();
+        out.println();
+    }
+
+    private void server(Stream<Metamodel.Endpoint> sorted) {
+        out.format("class KeyServer():%n");
+        sorted.forEach(this::serverEndpoint);
+    }
+
+    private void serverEndpoint(Metamodel.Endpoint endpoint) {
+        var args = endpoint.args().stream()
+                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                .collect(Collectors.joining(", "));
+        if (endpoint instanceof Metamodel.ServerRequest sr) {
+            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                    asPython(sr.returnType()));
+            out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
+            out.format("       return self.rpc.call_sync(\"%s\", %s)".formatted(endpoint.name(), ""));
+        } else {
+            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+            out.format("        return self.rpc.call_async(\"%s\", %s)".formatted(endpoint.name(), ""));
+        }
+        out.println();
+        out.println();
+    }
+
+    private void printType(Metamodel.Type type) {
+        if (type instanceof Metamodel.ObjectType ot) {
+            out.format("class %s:%n".formatted(type.name()));
+            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+            ot.fields().forEach(it -> out.format("    %s : %s%n".formatted(it.name(), asPython(it.type()))));
+        } else if (type instanceof Metamodel.EnumType et) {
+            out.format("class %s(enum.Enum):%n".formatted(type.name()));
+            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+            et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
+        }
+        out.println();
+    }
+
+    private String asPython(String typeName) {
+        return switch (typeName) {
+            case "INT" -> "int";
+            case "LONG" -> "int";
+            case "STRING" -> "str";
+            case "BOOL" -> "bool";
+            case "DOUBLE" -> "float";
+            default -> {
+                var t = findType(typeName);
+                yield asPython(t);
+            }
+        };
+    }
+
+    private String asPython(Metamodel.Type t) {
+        if (t instanceof Metamodel.ListType lt) {
+            return "typing.List[" + asPython(lt.type()) + "]";
+        }
+
+        if (t instanceof Metamodel.EitherType lt) {
+            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+        }
+        return t.name();
+    }
+
+    private Metamodel.Type findType(String typeName) {
+        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
+                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
+    }
+}
\ No newline at end of file
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index c2b84249430..fbbbac93898 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -10,10 +10,10 @@ plugins {
 description "Verification server interface via JSON-RPC"
 
 dependencies {
-    implementation(project(":key.core"))
-    implementation(project(":key.ui"))
+    api(project(":key.core"))
+    api(project(":key.ui"))
 
-    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
+    api("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
     implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index fd1b8352356..7ff86ae2c09 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -3,7 +3,6 @@
 import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.gui.Example;
 import de.uka.ilkd.key.gui.ExampleChooser;
 import de.uka.ilkd.key.macros.ProofMacroFacade;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -32,6 +31,7 @@
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.internal.NodeText;
+import org.keyproject.key.api.remoteapi.ExampleDesc;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
@@ -73,13 +73,14 @@ public KeyApiImpl() {
 
     @Override
     @JsonRequest
-    public CompletableFuture<List<Example>> examples() {
-        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+    public CompletableFuture<List<ExampleDesc>> examples() {
+        return CompletableFutures.computeAsync((c) ->
+                ExampleChooser.listExamples(ExampleChooser.lookForExamples()).stream().map(it -> ExampleDesc.from(it)).toList());
     }
 
     @Override
-    public CompletableFuture<Void> shutdown() {
-        return CompletableFuture.completedFuture(null);
+    public CompletableFuture<Boolean> shutdown() {
+        return CompletableFuture.completedFuture(true);
     }
 
     @Override
@@ -192,7 +193,8 @@ private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
     }
 
     private NodeDesc asNodeDesc(ProofId proofId, Node it) {
-        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(), it.getNodeInfo().getScriptRuleApplication());
+        return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(),
+                it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
@@ -204,10 +206,11 @@ public CompletableFuture<NodeDesc> tree(ProofId proofId) {
     }
 
     private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
+        final List<NodeDesc> list = root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
                 root.getNodeInfo().getBranchLabel(),
                 root.getNodeInfo().getScriptRuleApplication(),
-                root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList()
+                list
         );
     }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
deleted file mode 100644
index 0a27c633e5a..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.keyproject.key.api;
-
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public record NodeTextDesc(NodeTextId id, String result)  {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
index a99bed5fda9..f28001e8c15 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -2,9 +2,3 @@
 
 import org.keyproject.key.api.data.KeyIdentifications.NodeId;
 
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public record NodeTextId(NodeId nodeId, int nodeTextId) {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 51e0053eed6..31714a361d7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -9,10 +9,11 @@
 import de.uka.ilkd.key.pp.PosInSequent;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
 import org.keyproject.key.api.data.TermActionDesc;
 import org.keyproject.key.api.data.TermActionKind;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 0698a50a982..6d66823142a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -5,8 +5,7 @@
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.keyproject.key.api.NodeTextId;
+import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.internal.NodeText;
 
 import java.lang.ref.WeakReference;
@@ -109,11 +108,12 @@ public record ProofId(EnvironmentId env, String proofId) {
 
     /**
      * @author Alexander Weigl
-     * @version 1 (13.10.23)
+     * @version 1 (29.10.23)
      */
-    public record PrintId(String id) {
+    public record NodeTextId(NodeId nodeId, int nodeTextId) {
     }
 
+
     /**
      * @author Alexander Weigl
      * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index 9e24e0f4cd7..eda5e693f64 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,6 +1,6 @@
 package org.keyproject.key.api.data;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -8,7 +8,8 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record NodeDesc(KeyIdentifications.NodeId nodeid, String branchLabel,
+public record NodeDesc(KeyIdentifications.NodeId nodeid,
+                       String branchLabel,
                        boolean scriptRuleApplication,
                        @Nullable List<NodeDesc> children
 ) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
new file mode 100644
index 00000000000..333b24f1c73
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.data;
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result)  {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index 4e2de0d4010..d952ea3a654 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -1,6 +1,7 @@
 package org.keyproject.key.api.data;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
deleted file mode 100644
index 96d22acee47..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.keyproject.key.api.data;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
deleted file mode 100644
index 96d22acee47..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.keyproject.key.api.data;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index 9ccbb03049f..6c52dfd39aa 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -10,5 +10,5 @@
 @JsonSegment("examples")
 public interface ExampleApi {
     @JsonRequest("list")
-    CompletableFuture<List<Example>> examples();
+    CompletableFuture<List<ExampleDesc>> examples();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
new file mode 100644
index 00000000000..c0091943899
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
@@ -0,0 +1,13 @@
+package org.keyproject.key.api.remoteapi;
+
+import de.uka.ilkd.key.gui.Example;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public record ExampleDesc(String name, String description) {
+    public static ExampleDesc from(Example example) {
+        return new ExampleDesc(example.getName(), example.getDescription());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index 2f34293f0d5..959ed91570c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -3,8 +3,7 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.NodeTextDesc;
-import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.data.NodeTextDesc;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index ddd1fe408e6..00e85b9e021 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -29,7 +29,7 @@ public interface ServerManagement {
      * error: code and message set in case an exception happens during shutdown request.
      */
     @JsonRequest
-    CompletableFuture<Void> shutdown();
+    CompletableFuture<Boolean> shutdown();
 
     /**
      * Exit Notification (:arrow_right:)
diff --git a/keyext.api/src/main/python/keyapi/rpc.py b/keyext.api/src/main/python/keyapi/rpc.py
deleted file mode 100644
index 89dc6f3e041..00000000000
--- a/keyext.api/src/main/python/keyapi/rpc.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import abc
-import json
-from abc import abstractmethod
-from multiprocessing import Process, SimpleQueue, Lock, Value
-
-
-class Client(abc.ABC):
-    @abstractmethod
-    def handle(self, response):
-        pass
-
-
-class JsonRPCHandler:
-    client: Client
-
-    def __init__(self, in_stream, out_stream):
-        self.input = in_stream
-        self.out = out_stream
-        self.__id = 0
-        self.client: Client
-
-        self._events = dict()
-        self._responses = dict()
-
-        # t: Process = Process(target=self.__read)
-        # t.start()
-
-    def read_message(self):
-        length = 0
-        for clength in self.input.readlines():
-            if clength.startswith("Content-Length:"):
-                length = int(clength[14:])
-                break
-
-        payload = self.input.read(2 + length)
-        r = json.loads(payload)
-        if "id" in r:  # JSON response for request
-            rid = r["id"]
-            # self._responses[rid] = r
-            # if rid in self._events:
-            #    self._events[rid].set()
-        else:  # JSON notification
-            self.client.handle(r)
-        return r
-
-    def __read(self):
-        while True:
-            self.read_message()
-
-    # def __create_event(self, number):
-    #    self._events[number] = Event()
-
-    def _send(self, method, params):
-        self.__id += 1
-        id = self.__id
-        # self.__create_event(self.__id)
-        req = {"jsonrpc": "2.0", "method": method, "params": params, "id": self.__id}
-
-        self._write(json.dumps(req))
-        # self._wait_for(self.__id)
-
-        r = dict()
-        while "id" in r and str(r[id]) != str(id):
-            r = self.read_message()
-        return r
-
-    def _write(self, msg):
-        length = len(msg)
-        self.out.write(f"Content-Length: {length}\r\n")
-        self.out.write("\r\n")
-        self.out.write(msg)
-        self.out.write("\r\n")
-        self.out.flush()
-
-   # def _wait_for(self, rid):
-   #     self._events[rid].wait()
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index ae34b339231..5e0c87e06f5 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.keyproject.key.api.adapters.KeyAdapter;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -16,7 +15,6 @@
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -34,7 +32,7 @@ void setup() throws IOException {
         inClient.connect(outServer);
         outClient.connect(inServer);
 
-        KeyApiImpl impl = new KeyApiImpl(new KeyAdapter(null));
+        KeyApiImpl impl = new KeyApiImpl();
         Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer, impl);
         impl.setClientApi(serverLauncher.getRemoteProxy());
 
@@ -58,7 +56,7 @@ void setup() throws IOException {
     }
 
     @AfterEach
-    void teardown() throws ExecutionException, InterruptedException, TimeoutException {
+    void teardown() {
         serverListening.cancel(true);
         clientListening.cancel(true);
     }
diff --git a/keyext.api/src/main/python/keyapi/__init__.py b/keyext.client.python/keyapi/__init__.py
similarity index 54%
rename from keyext.api/src/main/python/keyapi/__init__.py
rename to keyext.client.python/keyapi/__init__.py
index 8523f3801f5..4a913b39b2e 100644
--- a/keyext.api/src/main/python/keyapi/__init__.py
+++ b/keyext.client.python/keyapi/__init__.py
@@ -1,13 +1,4 @@
-from keyapi.rpc import JsonRPCHandler, Client
-
-
-class KeyClient(Client):
-    def __int__(self):
-        pass
-
-    def handle(self, res):
-        print(res)
-
+from keyapi.rpc import *
 
 class KeyStub(JsonRPCHandler):
     def __init__(self, input, output):
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
new file mode 100644
index 00000000000..02ba2be474b
--- /dev/null
+++ b/keyext.client.python/keyapi/rpc.py
@@ -0,0 +1,200 @@
+import enum
+import json
+import sys
+import threading
+from io import TextIOWrapper
+from typing import Dict
+
+JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
+LEN_HEADER = "Content-Length: "
+TYPE_HEADER = "Content-Type: "
+
+
+class MyEncoder(json.JSONEncoder):
+    """
+    Encodes an object in JSON
+    """
+
+    def default(self, o):  # pylint: disable=E0202
+        return o.__dict__
+
+
+class ResponseError(Exception):
+    def __init__(self, error_code, message):
+        super().__init__(message)
+        self.error_code = error_code
+
+
+class ErrorCodes(enum.Enum):
+    ParseError = 1
+
+
+class JsonRpcEndpoint(object):
+    '''
+    Thread safe JSON RPC endpoint implementation. Responsible to recieve and send JSON RPC messages, as described in the
+    protocol. More information can be found: https://www.jsonrpc.org/
+    '''
+
+    def __init__(self, stdin, stdout):
+        self.stdin = stdin
+        self.stdout = stdout
+        self.read_lock = threading.Lock()
+        self.write_lock = threading.Lock()
+
+    @staticmethod
+    def __add_header(json_string):
+        '''
+        Adds a header for the given json string
+
+        :param str json_string: The string
+        :return: the string with the header
+        '''
+        return JSON_RPC_REQ_FORMAT.format(json_string_len=len(json_string), json_string=json_string)
+
+    def send_request(self, message):
+        '''
+        Sends the given message.
+
+        :param dict message: The message to send.
+        '''
+        json_string = json.dumps(message, cls=MyEncoder)
+        jsonrpc_req = self.__add_header(json_string)
+        with self.write_lock:
+            self.stdin.write(jsonrpc_req.encode())
+            self.stdin.flush()
+
+    def recv_response(self):
+        '''
+        Recives a message.
+
+        :return: a message
+        '''
+        with self.read_lock:
+            message_size = None
+            while True:
+                # read header
+                line = self.stdout.readline()
+                if not line:
+                    # server quit
+                    return None
+                line = line.decode("utf-8")
+                if not line.endswith("\r\n"):
+                    raise ResponseError(ErrorCodes.ParseError, "Bad header: missing newline")
+                # remove the "\r\n"
+                line = line[:-2]
+                if line == "":
+                    # done with the headers
+                    break
+                elif line.startswith(LEN_HEADER):
+                    line = line[len(LEN_HEADER):]
+                    if not line.isdigit():
+                        raise ResponseError(ErrorCodes.ParseError,
+                                            "Bad header: size is not int")
+                    message_size = int(line)
+                elif line.startswith(TYPE_HEADER):
+                    # nothing todo with type for now.
+                    pass
+                else:
+                    raise ResponseError(ErrorCodes.ParseError, "Bad header: unkown header")
+            if not message_size:
+                raise ResponseError(ErrorCodes.ParseError, "Bad header: missing size")
+
+            jsonrpc_res = self.stdout.read(message_size).decode("utf-8")
+            return json.loads(jsonrpc_res)
+
+
+class LspEndpoint(threading.Thread):
+    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2):
+        super().__init__()
+        self.json_rpc_endpoint: JsonRpcEndpoint = json_rpc_endpoint
+        self.notify_callbacks: Dict = notify_callbacks or {}
+        self.method_callbacks: Dict = method_callbacks or {}
+        self.event_dict = {}
+        self.response_dict = {}
+        self.next_id = 0
+        self._timeout = timeout
+        self.shutdown_flag = False
+
+    def handle_result(self, rpc_id, result, error):
+        self.response_dict[rpc_id] = (result, error)
+        cond = self.event_dict[rpc_id]
+        cond.acquire()
+        cond.notify()
+        cond.release()
+
+    def stop(self):
+        self.shutdown_flag = True
+
+    def run(self):
+        while not self.shutdown_flag:
+            try:
+                jsonrpc_message = self.json_rpc_endpoint.recv_response()
+                if jsonrpc_message is None:
+                    print("server quit")
+                    break
+                method = jsonrpc_message.get("method")
+                result = jsonrpc_message.get("result")
+                error = jsonrpc_message.get("error")
+                rpc_id = jsonrpc_message.get("id")
+                params = jsonrpc_message.get("params")
+
+                if method:
+                    if rpc_id:
+                        # a call for method
+                        if method not in self.method_callbacks:
+                            raise ResponseError(ErrorCodes.MethodNotFound,
+                                                "Method not found: {method}".format(method=method))
+                        result = self.method_callbacks[method](params)
+                        self.send_response(rpc_id, result, None)
+                    else:
+                        # a call for notify
+                        if method not in self.notify_callbacks:
+                            # Have nothing to do with this.
+                            print("Notify method not found: {method}.".format(method=method))
+                        else:
+                            self.notify_callbacks[method](params)
+                else:
+                    self.handle_result(rpc_id, result, error)
+            except ResponseError as e:
+                self.send_response(rpc_id, None, e)
+
+    def send_response(self, id, result, error):
+        message_dict = {"jsonrpc": "2.0", "id": id}
+        if result:
+            message_dict["result"] = result
+        if error:
+            message_dict["error"] = error
+        self.json_rpc_endpoint.send_request(message_dict)
+
+    def send_message(self, method_name, params, id=None):
+        message_dict = {}
+        message_dict["jsonrpc"] = "2.0"
+        if id is not None:
+            message_dict["id"] = id
+        message_dict["method"] = method_name
+        message_dict["params"] = params
+        self.json_rpc_endpoint.send_request(message_dict)
+
+    def call_method(self, method_name, **kwargs):
+        current_id = self.next_id
+        self.next_id += 1
+        cond = threading.Condition()
+        self.event_dict[current_id] = cond
+
+        cond.acquire()
+        self.send_message(method_name, kwargs, current_id)
+        if self.shutdown_flag:
+            return None
+
+        if not cond.wait(timeout=self._timeout):
+            raise TimeoutError()
+        cond.release()
+
+        self.event_dict.pop(current_id)
+        result, error = self.response_dict.pop(current_id)
+        if error:
+            raise ResponseError(error.get("code"), error.get("message"), error.get("data"))
+        return result
+
+    def send_notification(self, method_name, **kwargs):
+        self.send_message(method_name, kwargs)
diff --git a/keyext.api/src/main/python/main.py b/keyext.client.python/main.py
similarity index 100%
rename from keyext.api/src/main/python/main.py
rename to keyext.client.python/main.py
diff --git a/keyext.client.python/rwtest.py b/keyext.client.python/rwtest.py
new file mode 100644
index 00000000000..312532192dc
--- /dev/null
+++ b/keyext.client.python/rwtest.py
@@ -0,0 +1,402 @@
+import enum
+import abc
+import typing
+from abc import abstractmethod
+
+
+class ExampleDesc:
+    """"""
+
+    name: str
+    description: str
+
+
+class ProofScriptCommandDesc:
+    """"""
+
+
+class ProofMacroDesc:
+    """"""
+
+    name: str
+    category: str
+    description: str
+    scriptCommandName: str
+
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+
+class SetTraceParams:
+    """"""
+
+    value: TraceValue
+
+
+class EnvironmentId:
+    """"""
+
+    envId: str
+
+
+class ProofId:
+    """"""
+
+    env: EnvironmentId
+    proofId: str
+
+
+class TreeNodeDesc:
+    """"""
+
+
+class TreeNodeId:
+    """"""
+
+    id: str
+
+
+class NodeId:
+    """"""
+
+    proofId: ProofId
+    nodeId: int
+
+
+class PrintOptions:
+    """"""
+
+    unicode: bool
+    width: int
+    indentation: int
+    pure: bool
+    termLabels: bool
+
+
+class NodeTextId:
+    """"""
+
+    nodeId: NodeId
+    nodeTextId: int
+
+
+class NodeTextDesc:
+    """"""
+
+    id: NodeTextId
+    result: str
+
+
+class TermActionId:
+    """"""
+
+    nodeId: NodeId
+    pio: str
+    id: str
+
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+
+class TermActionDesc:
+    """"""
+
+    commandId: TermActionId
+    displayName: str
+    description: str
+    category: str
+    kind: TermActionKind
+
+
+class List:
+    """"""
+
+
+class SortDesc:
+    """"""
+
+    string: str
+    documentation: str
+    extendsSorts: List
+    anAbstract: bool
+    s: str
+
+
+class FunctionDesc:
+    """"""
+
+    name: str
+    sort: str
+    retSort: SortDesc
+    argSorts: List
+    rigid: bool
+    unique: bool
+    skolemConstant: bool
+
+
+class ContractId:
+    """"""
+
+    envId: EnvironmentId
+    contractId: int
+
+
+class ContractDesc:
+    """"""
+
+    contractId: ContractId
+    name: str
+    displayName: str
+    typeName: str
+    htmlText: str
+    plainText: str
+
+
+class LoadParams:
+    """"""
+
+    keyFile: str
+    javaFile: str
+    classPath: List
+    bootClassPath: str
+    includes: List
+
+
+class ProblemDefinition:
+    """"""
+
+    sorts: List
+    functions: List
+    predicates: List
+    antecTerms: List
+    succTerms: List
+
+
+class LogTraceParams:
+    """"""
+
+    messag: str
+    verbose: str
+
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+
+class ShowMessageParams:
+    """"""
+
+    type: MessageType
+    message: str
+
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type: MessageType
+    message: str
+    actions: typing.List[MessageActionItem]
+
+
+class MessageActionItem:
+    """"""
+
+    title: str
+
+
+class Range:
+    """"""
+
+    start: int
+    end: int
+
+
+class ShowDocumentParams:
+    """"""
+
+    uri: str
+    external: bool
+    takeFocus: bool
+    selection: Range
+
+
+class ShowDocumentResult:
+    """"""
+
+    success: bool
+
+
+class TaskFinishedInfo:
+    """"""
+
+
+class TaskStartedInfo:
+    """"""
+
+
+class KeyServer():
+    def env_contracts(self, arg0: EnvironmentId) -> typing.List[ContractDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/contracts", )
+
+    def env_functions(self, arg0: EnvironmentId) -> typing.List[FunctionDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/functions", )
+
+    def env_openContract(self, arg0: ContractId) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("env/openContract", )
+
+    def env_sorts(self, arg0: EnvironmentId) -> typing.List[SortDesc]:
+        """"""
+
+        return self.rpc.call_sync("env/sorts", )
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+        """"""
+
+        return self.rpc.call_sync("examples/list", )
+
+    def goal_actions(self, arg0: NodeTextId, arg1: int) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self.rpc.call_sync("goal/actions", )
+
+    def goal_apply_action(self, arg0: TermActionId) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self.rpc.call_sync("goal/apply_action", )
+
+    def goal_free(self, arg0: NodeTextId):
+        """"""
+
+        return self.rpc.call_async("goal/free", )
+
+    def goal_print(self, arg0: NodeId, arg1: PrintOptions) -> NodeTextDesc:
+        """"""
+
+        return self.rpc.call_sync("goal/print", )
+
+    def loading_load(self, arg0: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+        """"""
+
+        return self.rpc.call_sync("loading/load", )
+
+    def loading_loadExample(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadExample", )
+
+    def loading_loadKey(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadKey", )
+
+    def loading_loadProblem(self, arg0: ProblemDefinition) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadProblem", )
+
+    def loading_loadTerm(self, arg0: str) -> ProofId:
+        """"""
+
+        return self.rpc.call_sync("loading/loadTerm", )
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+        """"""
+
+        return self.rpc.call_sync("meta/available_macros", )
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+        """"""
+
+        return self.rpc.call_sync("meta/available_script_commands", )
+
+    def meta_version(self, ) -> str:
+        """"""
+
+        return self.rpc.call_sync("meta/version", )
+
+    def proofTree_children(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self.rpc.call_sync("proofTree/children", )
+
+    def proofTree_root(self, arg0: ProofId) -> TreeNodeDesc:
+        """"""
+
+        return self.rpc.call_sync("proofTree/root", )
+
+    def proofTree_subtree(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self.rpc.call_sync("proofTree/subtree", )
+
+    def server_exit(self, ):
+        """"""
+
+        return self.rpc.call_async("server/exit", )
+
+    def server_setTrace(self, arg0: SetTraceParams):
+        """"""
+
+        return self.rpc.call_async("server/setTrace", )
+
+    def server_shutdown(self, ) -> bool:
+        """"""
+
+        return self.rpc.call_sync("server/shutdown", )
+
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, arg0: LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, arg0: str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, arg0: ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, arg0: ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, arg0: ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass

From 0efeaa2728d3456a84dae2c39763cdb4ddd481f4 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Wed, 1 Nov 2023 15:52:40 +0100
Subject: [PATCH 16/50] running for primitive data types, somethings wrong in
 de-/serialization

---
 api.meta.json                                 | 445 +++++++++------
 api.meta.md                                   |  53 +-
 api.py                                        | 374 ------------
 keydata.py                                    | 493 ++++++++++++++++
 .../src/main/java/ExtractMetaData.java        |  25 +-
 keyext.api.doc/src/main/java/Metamodel.java   |   7 +-
 keyext.api.doc/src/main/java/PyGen.java       | 136 -----
 .../src/main/java/PythionGenerator.java       | 223 ++++++++
 keyext.api/build.gradle                       |   1 +
 .../keyproject/key/api/GenericSerializer.java |  56 ++
 .../org/keyproject/key/api/KeyApiImpl.java    |   3 +-
 .../org/keyproject/key/api/StartServer.java   |   7 +-
 .../key/api/adapters/KeyAdapter.java          |   2 +-
 .../ShowMessageRequestParams.java             |   4 +-
 keyext.client.python/keyapi/__init__.py       |  12 +-
 keyext.client.python/keyapi/keydata.py        | 533 ++++++++++++++++++
 keyext.client.python/keyapi/rpc.py            |  58 +-
 keyext.client.python/keyapi/server.py         | 161 ++++++
 keyext.client.python/main.py                  |  22 +-
 keyext.client.python/rwtest.py                | 402 -------------
 server.py                                     | 159 ++++++
 21 files changed, 2023 insertions(+), 1153 deletions(-)
 delete mode 100644 api.py
 create mode 100644 keydata.py
 delete mode 100644 keyext.api.doc/src/main/java/PyGen.java
 create mode 100644 keyext.api.doc/src/main/java/PythionGenerator.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
 create mode 100644 keyext.client.python/keyapi/keydata.py
 create mode 100644 keyext.client.python/keyapi/server.py
 delete mode 100644 keyext.client.python/rwtest.py
 create mode 100644 server.py

diff --git a/api.meta.json b/api.meta.json
index 180b16a3019..953b76c6088 100644
--- a/api.meta.json
+++ b/api.meta.json
@@ -10,11 +10,13 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -51,19 +53,23 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "scriptCommandName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -87,7 +93,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "SetTraceParams"
         }
       ]
@@ -97,7 +103,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "ProofId"
         }
       ],
@@ -112,11 +118,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "proof",
           "type": "ProofId"
         },
         {
-          "name": "arg1",
+          "name": "nodeId",
           "type": "TreeNodeId"
         }
       ],
@@ -134,11 +140,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "proof",
           "type": "ProofId"
         },
         {
-          "name": "arg1",
+          "name": "nodeId",
           "type": "TreeNodeId"
         }
       ],
@@ -156,11 +162,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeId"
         },
         {
-          "name": "arg1",
+          "name": "options",
           "type": "PrintOptions"
         }
       ],
@@ -169,11 +175,13 @@
         "fields": [
           {
             "name": "id",
-            "type": "NodeTextId"
+            "type": "NodeTextId",
+            "documentation": ""
           },
           {
             "name": "result",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -184,11 +192,11 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeTextId"
         },
         {
-          "name": "arg1",
+          "name": "pos",
           "type": "INT"
         }
       ],
@@ -198,23 +206,28 @@
           "fields": [
             {
               "name": "commandId",
-              "type": "TermActionId"
+              "type": "TermActionId",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "kind",
-              "type": "TermActionKind"
+              "type": "TermActionKind",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -227,7 +240,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "TermActionId"
         }
       ],
@@ -237,23 +250,28 @@
           "fields": [
             {
               "name": "commandId",
-              "type": "TermActionId"
+              "type": "TermActionId",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "description",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "category",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "kind",
-              "type": "TermActionKind"
+              "type": "TermActionKind",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -266,7 +284,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "NodeTextId"
         }
       ]
@@ -276,7 +294,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -286,31 +304,38 @@
           "fields": [
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "sort",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "retSort",
-              "type": "SortDesc"
+              "type": "SortDesc",
+              "documentation": ""
             },
             {
               "name": "argSorts",
-              "type": "List"
+              "type": "List",
+              "documentation": ""
             },
             {
               "name": "rigid",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "unique",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "skolemConstant",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -323,7 +348,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -333,23 +358,28 @@
           "fields": [
             {
               "name": "string",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "documentation",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "extendsSorts",
-              "type": "List"
+              "type": "List",
+              "documentation": ""
             },
             {
               "name": "anAbstract",
-              "type": "BOOL"
+              "type": "BOOL",
+              "documentation": ""
             },
             {
               "name": "s",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -362,7 +392,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "env",
           "type": "EnvironmentId"
         }
       ],
@@ -372,27 +402,33 @@
           "fields": [
             {
               "name": "contractId",
-              "type": "ContractId"
+              "type": "ContractId",
+              "documentation": ""
             },
             {
               "name": "name",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "displayName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "typeName",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "htmlText",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             },
             {
               "name": "plainText",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -405,7 +441,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "contractId",
           "type": "ContractId"
         }
       ],
@@ -414,11 +450,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -429,7 +467,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "LoadParams"
         }
       ],
@@ -439,7 +477,8 @@
           "fields": [
             {
               "name": "envId",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -449,11 +488,13 @@
           "fields": [
             {
               "name": "env",
-              "type": "EnvironmentId"
+              "type": "EnvironmentId",
+              "documentation": ""
             },
             {
               "name": "proofId",
-              "type": "STRING"
+              "type": "STRING",
+              "documentation": ""
             }
           ],
           "documentation": ""
@@ -462,11 +503,11 @@
       }
     },
     {
-      "name": "loading/loadKey",
+      "name": "loading/loadExample",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "id",
           "type": "STRING"
         }
       ],
@@ -475,23 +516,25 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
       }
     },
     {
-      "name": "loading/loadExample",
+      "name": "loading/loadProblem",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
-          "type": "STRING"
+          "name": "problem",
+          "type": "ProblemDefinition"
         }
       ],
       "returnType": {
@@ -499,23 +542,25 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
       }
     },
     {
-      "name": "loading/loadProblem",
+      "name": "loading/loadKey",
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
-          "type": "ProblemDefinition"
+          "name": "content",
+          "type": "STRING"
         }
       ],
       "returnType": {
@@ -523,11 +568,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -538,7 +585,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "term",
           "type": "STRING"
         }
       ],
@@ -547,11 +594,13 @@
         "fields": [
           {
             "name": "env",
-            "type": "EnvironmentId"
+            "type": "EnvironmentId",
+            "documentation": ""
           },
           {
             "name": "proofId",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -562,7 +611,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "e",
           "type": "STRING"
         }
       ]
@@ -572,7 +621,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "LogTraceParams"
         }
       ]
@@ -582,7 +631,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowMessageParams"
         }
       ]
@@ -592,7 +641,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowMessageRequestParams"
         }
       ],
@@ -601,7 +650,8 @@
         "fields": [
           {
             "name": "title",
-            "type": "STRING"
+            "type": "STRING",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -612,7 +662,7 @@
       "documentation": "",
       "args": [
         {
-          "name": "arg0",
+          "name": "params",
           "type": "ShowDocumentParams"
         }
       ],
@@ -621,7 +671,8 @@
         "fields": [
           {
             "name": "success",
-            "type": "BOOL"
+            "type": "BOOL",
+            "documentation": ""
           }
         ],
         "documentation": ""
@@ -634,11 +685,13 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -653,19 +706,23 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "category",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "scriptCommandName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -684,7 +741,8 @@
       "fields": [
         {
           "name": "value",
-          "type": "TraceValue"
+          "type": "TraceValue",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -694,7 +752,8 @@
       "fields": [
         {
           "name": "envId",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -704,11 +763,13 @@
       "fields": [
         {
           "name": "env",
-          "type": "EnvironmentId"
+          "type": "EnvironmentId",
+          "documentation": ""
         },
         {
           "name": "proofId",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -723,7 +784,8 @@
       "fields": [
         {
           "name": "id",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -733,11 +795,13 @@
       "fields": [
         {
           "name": "proofId",
-          "type": "ProofId"
+          "type": "ProofId",
+          "documentation": ""
         },
         {
           "name": "nodeId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -747,23 +811,28 @@
       "fields": [
         {
           "name": "unicode",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "width",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "indentation",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "pure",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "termLabels",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -773,11 +842,13 @@
       "fields": [
         {
           "name": "nodeId",
-          "type": "NodeId"
+          "type": "NodeId",
+          "documentation": ""
         },
         {
           "name": "nodeTextId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -787,11 +858,13 @@
       "fields": [
         {
           "name": "id",
-          "type": "NodeTextId"
+          "type": "NodeTextId",
+          "documentation": ""
         },
         {
           "name": "result",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -801,15 +874,18 @@
       "fields": [
         {
           "name": "nodeId",
-          "type": "NodeId"
+          "type": "NodeId",
+          "documentation": ""
         },
         {
           "name": "pio",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "id",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -829,23 +905,28 @@
       "fields": [
         {
           "name": "commandId",
-          "type": "TermActionId"
+          "type": "TermActionId",
+          "documentation": ""
         },
         {
           "name": "displayName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "description",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "category",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "kind",
-          "type": "TermActionKind"
+          "type": "TermActionKind",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -860,23 +941,28 @@
       "fields": [
         {
           "name": "string",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "documentation",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "extendsSorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "anAbstract",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "s",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -886,31 +972,38 @@
       "fields": [
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "sort",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "retSort",
-          "type": "SortDesc"
+          "type": "SortDesc",
+          "documentation": ""
         },
         {
           "name": "argSorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "rigid",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "unique",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "skolemConstant",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -920,11 +1013,13 @@
       "fields": [
         {
           "name": "envId",
-          "type": "EnvironmentId"
+          "type": "EnvironmentId",
+          "documentation": ""
         },
         {
           "name": "contractId",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -934,27 +1029,33 @@
       "fields": [
         {
           "name": "contractId",
-          "type": "ContractId"
+          "type": "ContractId",
+          "documentation": ""
         },
         {
           "name": "name",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "displayName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "typeName",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "htmlText",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "plainText",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -964,23 +1065,28 @@
       "fields": [
         {
           "name": "keyFile",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "javaFile",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "classPath",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "bootClassPath",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "includes",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -990,23 +1096,28 @@
       "fields": [
         {
           "name": "sorts",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "functions",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "predicates",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "antecTerms",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         },
         {
           "name": "succTerms",
-          "type": "List"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1016,11 +1127,13 @@
       "fields": [
         {
           "name": "messag",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "verbose",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1042,34 +1155,34 @@
       "fields": [
         {
           "name": "type",
-          "type": "MessageType"
+          "type": "MessageType",
+          "documentation": ""
         },
         {
           "name": "message",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
     },
-    {
-      "typeName": "MessageActionItem[]",
-      "fields": [],
-      "documentation": ""
-    },
     {
       "typeName": "ShowMessageRequestParams",
       "fields": [
         {
           "name": "type",
-          "type": "MessageType"
+          "type": "MessageType",
+          "documentation": ""
         },
         {
           "name": "message",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "actions",
-          "type": "MessageActionItem[]"
+          "type": "List",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1079,7 +1192,8 @@
       "fields": [
         {
           "name": "title",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1089,11 +1203,13 @@
       "fields": [
         {
           "name": "start",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         },
         {
           "name": "end",
-          "type": "INT"
+          "type": "INT",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1103,19 +1219,23 @@
       "fields": [
         {
           "name": "uri",
-          "type": "STRING"
+          "type": "STRING",
+          "documentation": ""
         },
         {
           "name": "external",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "takeFocus",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         },
         {
           "name": "selection",
-          "type": "Range"
+          "type": "Range",
+          "documentation": ""
         }
       ],
       "documentation": ""
@@ -1125,7 +1245,8 @@
       "fields": [
         {
           "name": "success",
-          "type": "BOOL"
+          "type": "BOOL",
+          "documentation": ""
         }
       ],
       "documentation": ""
diff --git a/api.meta.md b/api.meta.md
index f53d88619f3..f6d7a29c764 100644
--- a/api.meta.md
+++ b/api.meta.md
@@ -80,13 +80,6 @@ type MessageActionItem {
 }
 ```
 
-### Type: MessageActionItem[]
-```
-type MessageActionItem[] {
- 
-}
-```
-
 ### Type: MessageType
 ```
 enum MessageType { Unused, Error, Warning, Info, Log, Debug }
@@ -206,7 +199,7 @@ type ShowMessageParams {
 ### Type: ShowMessageRequestParams
 ```
 type ShowMessageRequestParams {
- 	actions : MessageActionItem[]
+ 	actions : List
 	message : STRING
 	type : MessageType
 }
@@ -285,63 +278,63 @@ type TreeNodeId {
 ### client/logTrace (`server ~~> client`) 
 
 ```
-Client.client/logTrace( arg0 : LogTraceParams ) **async**
+Client.client/logTrace( params : LogTraceParams ) **async**
 ```
 
 
 ### client/sayHello (`server ~~> client`) 
 
 ```
-Client.client/sayHello( arg0 : STRING ) **async**
+Client.client/sayHello( e : STRING ) **async**
 ```
 
 
 ### client/showDocument (`server -> client`) 
 
 ```
-Client.client/showDocument( arg0 : ShowDocumentParams ) -> ShowDocumentResult
+Client.client/showDocument( params : ShowDocumentParams ) -> ShowDocumentResult
 ```
 
 
 ### client/sm (`server ~~> client`) 
 
 ```
-Client.client/sm( arg0 : ShowMessageParams ) **async**
+Client.client/sm( params : ShowMessageParams ) **async**
 ```
 
 
 ### client/userResponse (`server -> client`) 
 
 ```
-Client.client/userResponse( arg0 : ShowMessageRequestParams ) -> MessageActionItem
+Client.client/userResponse( params : ShowMessageRequestParams ) -> MessageActionItem
 ```
 
 
 ### env/contracts (`client -> server`) 
 
 ```
-Server.env/contracts( arg0 : EnvironmentId ) -> ContractDesc[]
+Server.env/contracts( env : EnvironmentId ) -> ContractDesc[]
 ```
 
 
 ### env/functions (`client -> server`) 
 
 ```
-Server.env/functions( arg0 : EnvironmentId ) -> FunctionDesc[]
+Server.env/functions( env : EnvironmentId ) -> FunctionDesc[]
 ```
 
 
 ### env/openContract (`client -> server`) 
 
 ```
-Server.env/openContract( arg0 : ContractId ) -> ProofId
+Server.env/openContract( contractId : ContractId ) -> ProofId
 ```
 
 
 ### env/sorts (`client -> server`) 
 
 ```
-Server.env/sorts( arg0 : EnvironmentId ) -> SortDesc[]
+Server.env/sorts( env : EnvironmentId ) -> SortDesc[]
 ```
 
 
@@ -355,63 +348,63 @@ Server.examples/list(  ) -> ExampleDesc[]
 ### goal/actions (`client -> server`) 
 
 ```
-Server.goal/actions( arg0 : NodeTextId, arg1 : INT ) -> TermActionDesc[]
+Server.goal/actions( id : NodeTextId, pos : INT ) -> TermActionDesc[]
 ```
 
 
 ### goal/apply_action (`client -> server`) 
 
 ```
-Server.goal/apply_action( arg0 : TermActionId ) -> TermActionDesc[]
+Server.goal/apply_action( id : TermActionId ) -> TermActionDesc[]
 ```
 
 
 ### goal/free (`client ~~> server`) 
 
 ```
-Server.goal/free( arg0 : NodeTextId ) **async**
+Server.goal/free( id : NodeTextId ) **async**
 ```
 
 
 ### goal/print (`client -> server`) 
 
 ```
-Server.goal/print( arg0 : NodeId, arg1 : PrintOptions ) -> NodeTextDesc
+Server.goal/print( id : NodeId, options : PrintOptions ) -> NodeTextDesc
 ```
 
 
 ### loading/load (`client -> server`) 
 
 ```
-Server.loading/load( arg0 : LoadParams ) -> either<a,b>
+Server.loading/load( params : LoadParams ) -> either<a,b>
 ```
 
 
 ### loading/loadExample (`client -> server`) 
 
 ```
-Server.loading/loadExample( arg0 : STRING ) -> ProofId
+Server.loading/loadExample( id : STRING ) -> ProofId
 ```
 
 
 ### loading/loadKey (`client -> server`) 
 
 ```
-Server.loading/loadKey( arg0 : STRING ) -> ProofId
+Server.loading/loadKey( content : STRING ) -> ProofId
 ```
 
 
 ### loading/loadProblem (`client -> server`) 
 
 ```
-Server.loading/loadProblem( arg0 : ProblemDefinition ) -> ProofId
+Server.loading/loadProblem( problem : ProblemDefinition ) -> ProofId
 ```
 
 
 ### loading/loadTerm (`client -> server`) 
 
 ```
-Server.loading/loadTerm( arg0 : STRING ) -> ProofId
+Server.loading/loadTerm( term : STRING ) -> ProofId
 ```
 
 
@@ -439,21 +432,21 @@ Server.meta/version(  ) -> STRING
 ### proofTree/children (`client -> server`) 
 
 ```
-Server.proofTree/children( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+Server.proofTree/children( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
 ```
 
 
 ### proofTree/root (`client -> server`) 
 
 ```
-Server.proofTree/root( arg0 : ProofId ) -> TreeNodeDesc
+Server.proofTree/root( id : ProofId ) -> TreeNodeDesc
 ```
 
 
 ### proofTree/subtree (`client -> server`) 
 
 ```
-Server.proofTree/subtree( arg0 : ProofId, arg1 : TreeNodeId ) -> TreeNodeDesc[]
+Server.proofTree/subtree( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
 ```
 
 
@@ -467,7 +460,7 @@ Server.server/exit(  ) **async**
 ### server/setTrace (`client ~~> server`) 
 
 ```
-Server.server/setTrace( arg0 : SetTraceParams ) **async**
+Server.server/setTrace( params : SetTraceParams ) **async**
 ```
 
 
diff --git a/api.py b/api.py
deleted file mode 100644
index c83050a763e..00000000000
--- a/api.py
+++ /dev/null
@@ -1,374 +0,0 @@
-import enum
-import abc
-import typing
-class ExampleDesc:
-    """"""
-
-    name : str
-    description : str
-
-class ProofScriptCommandDesc:
-    """"""
-
-
-class ProofMacroDesc:
-    """"""
-
-    name : str
-    category : str
-    description : str
-    scriptCommandName : str
-
-class TraceValue(enum.Enum):
-    """"""
-
-    Off = None
-    Message = None
-    All = None
-
-class SetTraceParams:
-    """"""
-
-    value : TraceValue
-
-class EnvironmentId:
-    """"""
-
-    envId : str
-
-class ProofId:
-    """"""
-
-    env : EnvironmentId
-    proofId : str
-
-class TreeNodeDesc:
-    """"""
-
-
-class TreeNodeId:
-    """"""
-
-    id : str
-
-class NodeId:
-    """"""
-
-    proofId : ProofId
-    nodeId : int
-
-class PrintOptions:
-    """"""
-
-    unicode : bool
-    width : int
-    indentation : int
-    pure : bool
-    termLabels : bool
-
-class NodeTextId:
-    """"""
-
-    nodeId : NodeId
-    nodeTextId : int
-
-class NodeTextDesc:
-    """"""
-
-    id : NodeTextId
-    result : str
-
-class TermActionId:
-    """"""
-
-    nodeId : NodeId
-    pio : str
-    id : str
-
-class TermActionKind(enum.Enum):
-    """"""
-
-    BuiltIn = None
-    Script = None
-    Macro = None
-    Taclet = None
-
-class TermActionDesc:
-    """"""
-
-    commandId : TermActionId
-    displayName : str
-    description : str
-    category : str
-    kind : TermActionKind
-
-class List:
-    """"""
-
-
-class SortDesc:
-    """"""
-
-    string : str
-    documentation : str
-    extendsSorts : List
-    anAbstract : bool
-    s : str
-
-class FunctionDesc:
-    """"""
-
-    name : str
-    sort : str
-    retSort : SortDesc
-    argSorts : List
-    rigid : bool
-    unique : bool
-    skolemConstant : bool
-
-class ContractId:
-    """"""
-
-    envId : EnvironmentId
-    contractId : int
-
-class ContractDesc:
-    """"""
-
-    contractId : ContractId
-    name : str
-    displayName : str
-    typeName : str
-    htmlText : str
-    plainText : str
-
-class LoadParams:
-    """"""
-
-    keyFile : str
-    javaFile : str
-    classPath : List
-    bootClassPath : str
-    includes : List
-
-class ProblemDefinition:
-    """"""
-
-    sorts : List
-    functions : List
-    predicates : List
-    antecTerms : List
-    succTerms : List
-
-class LogTraceParams:
-    """"""
-
-    messag : str
-    verbose : str
-
-class MessageType(enum.Enum):
-    """"""
-
-    Unused = None
-    Error = None
-    Warning = None
-    Info = None
-    Log = None
-    Debug = None
-
-class ShowMessageParams:
-    """"""
-
-    type : MessageType
-    message : str
-
-class MessageActionItem[]:
-    """"""
-
-
-class ShowMessageRequestParams:
-    """"""
-
-    type : MessageType
-    message : str
-    actions : MessageActionItem[]
-
-class MessageActionItem:
-    """"""
-
-    title : str
-
-class Range:
-    """"""
-
-    start : int
-    end : int
-
-class ShowDocumentParams:
-    """"""
-
-    uri : str
-    external : bool
-    takeFocus : bool
-    selection : Range
-
-class ShowDocumentResult:
-    """"""
-
-    success : bool
-
-class TaskFinishedInfo:
-    """"""
-
-
-class TaskStartedInfo:
-    """"""
-
-
-class KeyServer():
-    def env_contracts(self, arg0 : EnvironmentId) -> typing.List[ContractDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/contracts", )
-
-    def env_functions(self, arg0 : EnvironmentId) -> typing.List[FunctionDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/functions", )
-
-    def env_openContract(self, arg0 : ContractId) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("env/openContract", )
-
-    def env_sorts(self, arg0 : EnvironmentId) -> typing.List[SortDesc]:
-       """"""
-
-       return self.rpc.call_sync("env/sorts", )
-
-    def examples_list(self, ) -> typing.List[ExampleDesc]:
-       """"""
-
-       return self.rpc.call_sync("examples/list", )
-
-    def goal_actions(self, arg0 : NodeTextId, arg1 : int) -> typing.List[TermActionDesc]:
-       """"""
-
-       return self.rpc.call_sync("goal/actions", )
-
-    def goal_apply_action(self, arg0 : TermActionId) -> typing.List[TermActionDesc]:
-       """"""
-
-       return self.rpc.call_sync("goal/apply_action", )
-
-    def goal_free(self, arg0 : NodeTextId):
-        """"""
-
-        return self.rpc.call_async("goal/free", )
-
-    def goal_print(self, arg0 : NodeId, arg1 : PrintOptions) -> NodeTextDesc:
-       """"""
-
-       return self.rpc.call_sync("goal/print", )
-
-    def loading_load(self, arg0 : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
-       """"""
-
-       return self.rpc.call_sync("loading/load", )
-
-    def loading_loadExample(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadExample", )
-
-    def loading_loadKey(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadKey", )
-
-    def loading_loadProblem(self, arg0 : ProblemDefinition) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadProblem", )
-
-    def loading_loadTerm(self, arg0 : str) -> ProofId:
-       """"""
-
-       return self.rpc.call_sync("loading/loadTerm", )
-
-    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
-       """"""
-
-       return self.rpc.call_sync("meta/available_macros", )
-
-    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
-       """"""
-
-       return self.rpc.call_sync("meta/available_script_commands", )
-
-    def meta_version(self, ) -> STRING:
-       """"""
-
-       return self.rpc.call_sync("meta/version", )
-
-    def proofTree_children(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
-       """"""
-
-       return self.rpc.call_sync("proofTree/children", )
-
-    def proofTree_root(self, arg0 : ProofId) -> TreeNodeDesc:
-       """"""
-
-       return self.rpc.call_sync("proofTree/root", )
-
-    def proofTree_subtree(self, arg0 : ProofId, arg1 : TreeNodeId) -> typing.List[TreeNodeDesc]:
-       """"""
-
-       return self.rpc.call_sync("proofTree/subtree", )
-
-    def server_exit(self, ):
-        """"""
-
-        return self.rpc.call_async("server/exit", )
-
-    def server_setTrace(self, arg0 : SetTraceParams):
-        """"""
-
-        return self.rpc.call_async("server/setTrace", )
-
-    def server_shutdown(self, ) -> BOOL:
-       """"""
-
-       return self.rpc.call_sync("server/shutdown", )
-
-class Client(abc.AbcMeta):
-    @abstractmethod
-    def client_logTrace(self, arg0 : LogTraceParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sayHello(self, arg0 : str):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_showDocument(self, arg0 : ShowDocumentParams) -> ShowDocumentResult:
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sm(self, arg0 : ShowMessageParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_userResponse(self, arg0 : ShowMessageRequestParams) -> MessageActionItem:
-        """"""
-
-        pass
-
diff --git a/keydata.py b/keydata.py
new file mode 100644
index 00000000000..59511c2a7a8
--- /dev/null
+++ b/keydata.py
@@ -0,0 +1,493 @@
+from __future__ import annotations
+import enum
+import abc
+import typing
+from abc import abstractmethod, ABCMeta
+
+class ExampleDesc:
+    """"""
+
+    name : str
+    """"""
+
+    description : str
+    """"""
+
+    def __init__(self, name, description):
+        self.name = name
+        self.description = description
+
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class ProofMacroDesc:
+    """"""
+
+    name : str
+    """"""
+
+    category : str
+    """"""
+
+    description : str
+    """"""
+
+    scriptCommandName : str
+    """"""
+
+    def __init__(self, name, category, description, scriptCommandName):
+        self.name = name
+        self.category = category
+        self.description = description
+        self.scriptCommandName = scriptCommandName
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+class SetTraceParams:
+    """"""
+
+    value : TraceValue
+    """"""
+
+    def __init__(self, value):
+        self.value = value
+
+class EnvironmentId:
+    """"""
+
+    envId : str
+    """"""
+
+    def __init__(self, envId):
+        self.envId = envId
+
+class ProofId:
+    """"""
+
+    env : EnvironmentId
+    """"""
+
+    proofId : str
+    """"""
+
+    def __init__(self, env, proofId):
+        self.env = env
+        self.proofId = proofId
+
+class TreeNodeDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TreeNodeId:
+    """"""
+
+    id : str
+    """"""
+
+    def __init__(self, id):
+        self.id = id
+
+class NodeId:
+    """"""
+
+    proofId : ProofId
+    """"""
+
+    nodeId : int
+    """"""
+
+    def __init__(self, proofId, nodeId):
+        self.proofId = proofId
+        self.nodeId = nodeId
+
+class PrintOptions:
+    """"""
+
+    unicode : bool
+    """"""
+
+    width : int
+    """"""
+
+    indentation : int
+    """"""
+
+    pure : bool
+    """"""
+
+    termLabels : bool
+    """"""
+
+    def __init__(self, unicode, width, indentation, pure, termLabels):
+        self.unicode = unicode
+        self.width = width
+        self.indentation = indentation
+        self.pure = pure
+        self.termLabels = termLabels
+
+class NodeTextId:
+    """"""
+
+    nodeId : NodeId
+    """"""
+
+    nodeTextId : int
+    """"""
+
+    def __init__(self, nodeId, nodeTextId):
+        self.nodeId = nodeId
+        self.nodeTextId = nodeTextId
+
+class NodeTextDesc:
+    """"""
+
+    id : NodeTextId
+    """"""
+
+    result : str
+    """"""
+
+    def __init__(self, id, result):
+        self.id = id
+        self.result = result
+
+class TermActionId:
+    """"""
+
+    nodeId : NodeId
+    """"""
+
+    pio : str
+    """"""
+
+    id : str
+    """"""
+
+    def __init__(self, nodeId, pio, id):
+        self.nodeId = nodeId
+        self.pio = pio
+        self.id = id
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+class TermActionDesc:
+    """"""
+
+    commandId : TermActionId
+    """"""
+
+    displayName : str
+    """"""
+
+    description : str
+    """"""
+
+    category : str
+    """"""
+
+    kind : TermActionKind
+    """"""
+
+    def __init__(self, commandId, displayName, description, category, kind):
+        self.commandId = commandId
+        self.displayName = displayName
+        self.description = description
+        self.category = category
+        self.kind = kind
+
+class List:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class SortDesc:
+    """"""
+
+    string : str
+    """"""
+
+    documentation : str
+    """"""
+
+    extendsSorts : List
+    """"""
+
+    anAbstract : bool
+    """"""
+
+    s : str
+    """"""
+
+    def __init__(self, string, documentation, extendsSorts, anAbstract, s):
+        self.string = string
+        self.documentation = documentation
+        self.extendsSorts = extendsSorts
+        self.anAbstract = anAbstract
+        self.s = s
+
+class FunctionDesc:
+    """"""
+
+    name : str
+    """"""
+
+    sort : str
+    """"""
+
+    retSort : SortDesc
+    """"""
+
+    argSorts : List
+    """"""
+
+    rigid : bool
+    """"""
+
+    unique : bool
+    """"""
+
+    skolemConstant : bool
+    """"""
+
+    def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant):
+        self.name = name
+        self.sort = sort
+        self.retSort = retSort
+        self.argSorts = argSorts
+        self.rigid = rigid
+        self.unique = unique
+        self.skolemConstant = skolemConstant
+
+class ContractId:
+    """"""
+
+    envId : EnvironmentId
+    """"""
+
+    contractId : int
+    """"""
+
+    def __init__(self, envId, contractId):
+        self.envId = envId
+        self.contractId = contractId
+
+class ContractDesc:
+    """"""
+
+    contractId : ContractId
+    """"""
+
+    name : str
+    """"""
+
+    displayName : str
+    """"""
+
+    typeName : str
+    """"""
+
+    htmlText : str
+    """"""
+
+    plainText : str
+    """"""
+
+    def __init__(self, contractId, name, displayName, typeName, htmlText, plainText):
+        self.contractId = contractId
+        self.name = name
+        self.displayName = displayName
+        self.typeName = typeName
+        self.htmlText = htmlText
+        self.plainText = plainText
+
+class LoadParams:
+    """"""
+
+    keyFile : str
+    """"""
+
+    javaFile : str
+    """"""
+
+    classPath : List
+    """"""
+
+    bootClassPath : str
+    """"""
+
+    includes : List
+    """"""
+
+    def __init__(self, keyFile, javaFile, classPath, bootClassPath, includes):
+        self.keyFile = keyFile
+        self.javaFile = javaFile
+        self.classPath = classPath
+        self.bootClassPath = bootClassPath
+        self.includes = includes
+
+class ProblemDefinition:
+    """"""
+
+    sorts : List
+    """"""
+
+    functions : List
+    """"""
+
+    predicates : List
+    """"""
+
+    antecTerms : List
+    """"""
+
+    succTerms : List
+    """"""
+
+    def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
+        self.sorts = sorts
+        self.functions = functions
+        self.predicates = predicates
+        self.antecTerms = antecTerms
+        self.succTerms = succTerms
+
+class LogTraceParams:
+    """"""
+
+    messag : str
+    """"""
+
+    verbose : str
+    """"""
+
+    def __init__(self, messag, verbose):
+        self.messag = messag
+        self.verbose = verbose
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+class ShowMessageParams:
+    """"""
+
+    type : MessageType
+    """"""
+
+    message : str
+    """"""
+
+    def __init__(self, type, message):
+        self.type = type
+        self.message = message
+
+class ShowMessageRequestParams:
+    """"""
+
+    type : MessageType
+    """"""
+
+    message : str
+    """"""
+
+    actions : List
+    """"""
+
+    def __init__(self, type, message, actions):
+        self.type = type
+        self.message = message
+        self.actions = actions
+
+class MessageActionItem:
+    """"""
+
+    title : str
+    """"""
+
+    def __init__(self, title):
+        self.title = title
+
+class Range:
+    """"""
+
+    start : int
+    """"""
+
+    end : int
+    """"""
+
+    def __init__(self, start, end):
+        self.start = start
+        self.end = end
+
+class ShowDocumentParams:
+    """"""
+
+    uri : str
+    """"""
+
+    external : bool
+    """"""
+
+    takeFocus : bool
+    """"""
+
+    selection : Range
+    """"""
+
+    def __init__(self, uri, external, takeFocus, selection):
+        self.uri = uri
+        self.external = external
+        self.takeFocus = takeFocus
+        self.selection = selection
+
+class ShowDocumentResult:
+    """"""
+
+    success : bool
+    """"""
+
+    def __init__(self, success):
+        self.success = success
+
+class TaskFinishedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TaskStartedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"ProofMacroDesc": ProofMacroDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"NodeId": NodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"List": List,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index 2855e390f75..1c6c904553e 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -22,6 +22,8 @@
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * @author Alexander Weigl
@@ -43,21 +45,16 @@ public static void main(String[] args) {
             addClientEndpoint(method);
         }
 
-        try {
-            Files.writeString(Paths.get("api.meta.json"), getGson().toJson(keyApi));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        runGenerator("api.meta.json", (a) -> () -> getGson().toJson(a));
+        runGenerator("api.meta.md", DocGen::new);
+        runGenerator("keydata.py", PythionGenerator.PyDataGen::new);
+        runGenerator("server.py", PythionGenerator.PyApiGen::new);
+    }
 
+    private static void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
         try {
-            var n = new DocGen(keyApi);
-            Files.writeString(Paths.get("api.meta.md"), n.get());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        try {
-            var n = new PyGen(keyApi);
-            Files.writeString(Paths.get("api.py"), n.get());
+            var n = api.apply(keyApi);
+            Files.writeString(Paths.get(target), n.get());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -124,7 +121,7 @@ private static List<Metamodel.Argument> translate(Parameter[] parameters) {
     }
 
     private static Metamodel.Argument translate(Parameter parameter) {
-        var type =  getOrFindType(parameter.getType()).name();
+        var type = getOrFindType(parameter.getType()).name();
         return new Metamodel.Argument(parameter.getName(), type);
     }
 
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index 833699cfe0c..1a868f49a06 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -41,10 +41,13 @@ record ClientRequest(String name, String documentation, List<Argument> args, Typ
     record ClientNotification(String name, String documentation, List<Argument> args) implements Endpoint {
     }
 
-    record Field(String name, /*Type*/ String type) {
+    record Field(String name, /*Type*/ String type, String documentation) {
+        Field(String name, String type) {
+            this(name, type, "");
+        }
     }
 
-    sealed interface Type {
+    public sealed interface Type {
         default String kind() {
             return getClass().getSimpleName();
         }
diff --git a/keyext.api.doc/src/main/java/PyGen.java b/keyext.api.doc/src/main/java/PyGen.java
deleted file mode 100644
index 357c2f51e8d..00000000000
--- a/keyext.api.doc/src/main/java/PyGen.java
+++ /dev/null
@@ -1,136 +0,0 @@
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public class PyGen implements Supplier<String> {
-    private final Metamodel.KeyApi metamodel;
-    private PrintWriter out;
-    private final StringWriter target = new StringWriter();
-
-    public PyGen(Metamodel.KeyApi metamodel) {
-        this.metamodel = metamodel;
-    }
-
-    @Override
-    public String get() {
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-
-            out.format("""
-                    import enum
-                    import abc
-                    import typing
-                    from abc import abstractmethod                    
-                    """);
-
-            metamodel.types().forEach(this::printType);
-            server(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
-
-            client(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
-
-        }
-        return target.toString();
-    }
-
-    private void client(Stream<Metamodel.Endpoint> sorted) {
-        out.format("class Client(abc.AbcMeta):%n");
-        sorted.forEach(this::clientEndpoint);
-    }
-
-    private void clientEndpoint(Metamodel.Endpoint endpoint) {
-        var args = endpoint.args().stream()
-                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
-                .collect(Collectors.joining(", "));
-        out.format("    @abstractmethod%n");
-        if (endpoint instanceof Metamodel.ClientRequest sr) {
-            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args, asPython(sr.returnType()));
-        } else {
-            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
-        }
-        out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-        out.format("        pass".formatted(endpoint.name(), ""));
-        out.println();
-        out.println();
-    }
-
-    private void server(Stream<Metamodel.Endpoint> sorted) {
-        out.format("class KeyServer():%n");
-        sorted.forEach(this::serverEndpoint);
-    }
-
-    private void serverEndpoint(Metamodel.Endpoint endpoint) {
-        var args = endpoint.args().stream()
-                .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
-                .collect(Collectors.joining(", "));
-        if (endpoint instanceof Metamodel.ServerRequest sr) {
-            out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                    asPython(sr.returnType()));
-            out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
-            out.format("       return self.rpc.call_sync(\"%s\", %s)".formatted(endpoint.name(), ""));
-        } else {
-            out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
-            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-            out.format("        return self.rpc.call_async(\"%s\", %s)".formatted(endpoint.name(), ""));
-        }
-        out.println();
-        out.println();
-    }
-
-    private void printType(Metamodel.Type type) {
-        if (type instanceof Metamodel.ObjectType ot) {
-            out.format("class %s:%n".formatted(type.name()));
-            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
-            ot.fields().forEach(it -> out.format("    %s : %s%n".formatted(it.name(), asPython(it.type()))));
-        } else if (type instanceof Metamodel.EnumType et) {
-            out.format("class %s(enum.Enum):%n".formatted(type.name()));
-            out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
-            et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
-        }
-        out.println();
-    }
-
-    private String asPython(String typeName) {
-        return switch (typeName) {
-            case "INT" -> "int";
-            case "LONG" -> "int";
-            case "STRING" -> "str";
-            case "BOOL" -> "bool";
-            case "DOUBLE" -> "float";
-            default -> {
-                var t = findType(typeName);
-                yield asPython(t);
-            }
-        };
-    }
-
-    private String asPython(Metamodel.Type t) {
-        if (t instanceof Metamodel.ListType lt) {
-            return "typing.List[" + asPython(lt.type()) + "]";
-        }
-
-        if (t instanceof Metamodel.EitherType lt) {
-            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
-        }
-        return t.name();
-    }
-
-    private Metamodel.Type findType(String typeName) {
-        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
-                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
-    }
-}
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/PythionGenerator.java b/keyext.api.doc/src/main/java/PythionGenerator.java
new file mode 100644
index 00000000000..a4d2018c328
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PythionGenerator.java
@@ -0,0 +1,223 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public abstract class PythionGenerator implements Supplier<String> {
+    protected final Metamodel.KeyApi metamodel;
+    protected PrintWriter out;
+    protected final StringWriter target = new StringWriter();
+
+    public PythionGenerator(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+            run();
+        }
+        return target.toString();
+    }
+
+    protected abstract void run();
+
+    protected String asPython(String typeName) {
+        return switch (typeName) {
+            case "INT" -> "int";
+            case "LONG" -> "int";
+            case "STRING" -> "str";
+            case "BOOL" -> "bool";
+            case "DOUBLE" -> "float";
+            default -> {
+                var t = findType(typeName);
+                yield asPython(t);
+            }
+        };
+    }
+
+    protected String asPython(Metamodel.Type t) {
+        if (t instanceof Metamodel.ListType lt) {
+            return "typing.List[" + asPython(lt.type()) + "]";
+        }
+
+        if (t instanceof Metamodel.EitherType lt) {
+            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+        }
+
+        if (t instanceof Metamodel.BuiltinType bt) {
+            return switch (bt) {
+                case INT -> "int";
+                case LONG -> "int";
+                case STRING -> "str";
+                case BOOL -> "bool";
+                case DOUBLE -> "float";
+            };
+        }
+        return t.name();
+    }
+
+    protected Metamodel.Type findType(String typeName) {
+        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
+                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
+    }
+
+
+    public static class PyApiGen extends PythionGenerator {
+        public PyApiGen(Metamodel.KeyApi metamodel) {
+            super(metamodel);
+        }
+
+        @Override
+        protected void run() {
+            out.format("""
+                    from __future__ import annotations
+                    from .keydata import *
+                    from .rpc import ServerBase, LspEndpoint
+
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod                    
+                    """);
+            server(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+
+            client(
+                    metamodel.endpoints()
+                            .stream()
+                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
+                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+        }
+
+
+        private void client(Stream<Metamodel.Endpoint> sorted) {
+            out.format("class Client(abc.ABCMeta):%n");
+            sorted.forEach(this::clientEndpoint);
+        }
+
+        private void clientEndpoint(Metamodel.Endpoint endpoint) {
+            var args = endpoint.args().stream()
+                    .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                    .collect(Collectors.joining(", "));
+            out.format("    @abstractmethod%n");
+            if (endpoint instanceof Metamodel.ClientRequest sr) {
+                out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                        asPython(sr.returnType()));
+            } else {
+                out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+            }
+            out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+            out.format("        pass".formatted(endpoint.name(), ""));
+            out.println();
+            out.println();
+        }
+
+        private void server(Stream<Metamodel.Endpoint> sorted) {
+            out.format("""
+                    class KeyServer(ServerBase):%n
+                        def __init__(self, endpoint : LspEndpoint):
+                            super().__init__(endpoint)
+                              
+                     """);
+            sorted.forEach(this::serverEndpoint);
+        }
+
+        private void serverEndpoint(Metamodel.Endpoint endpoint) {
+            var args = endpoint.args().stream()
+                    .map(it -> "%s : %s".formatted(it.name(), asPython(it.type())))
+                    .collect(Collectors.joining(", "));
+
+            var params = "[]";
+            if (!endpoint.args().isEmpty()) {
+                params = endpoint.args().stream()
+                        .map(Metamodel.Argument::name)
+                        .collect(Collectors.joining(" , ", "[", "]"));
+            }
+
+            if (endpoint instanceof Metamodel.ServerRequest sr) {
+                out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
+                        asPython(sr.returnType()));
+                out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
+                out.format("       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
+            } else {
+                out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
+                out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
+                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(), params));
+            }
+            out.println();
+            out.println();
+        }
+
+    }
+
+
+    public static class PyDataGen extends PythionGenerator {
+        public PyDataGen(Metamodel.KeyApi metamodel) {
+            super(metamodel);
+        }
+
+        @Override
+        public String get() {
+            try (var out = new PrintWriter(target)) {
+                this.out = out;
+                run();
+            }
+            return target.toString();
+        }
+
+        protected void run() {
+            out.format("""
+                    from __future__ import annotations
+                    import enum
+                    import abc
+                    import typing
+                    from abc import abstractmethod, ABCMeta
+                                                          
+                    """);
+            metamodel.types().forEach(this::printType);
+
+            var names = metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
+                    .collect(Collectors.joining(","));
+            out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
+        }
+
+        private void printType(Metamodel.Type type) {
+            if (type instanceof Metamodel.ObjectType ot) {
+                out.format("class %s:%n".formatted(type.name()));
+                out.format("    \"\"\"%s\"\"\"%n", type.documentation());
+                ot.fields().forEach(it -> out.format("%n    %s : %s%n    \"\"\"%s\"\"\"%n"
+                        .formatted(it.name(), asPython(it.type()), it.documentation())));
+
+                out.format("\n    def __init__(self%s):%n".formatted(
+                        ot.fields().stream()
+                                .map(Metamodel.Field::name)
+                                .collect(Collectors.joining(", ", ", ", ""))
+                ));
+
+                if (ot.fields().isEmpty())
+                    out.format("        pass%n%n");
+
+                for (Metamodel.Field field : ot.fields()) {
+                    out.format("        self.%s = %s%n", field.name(), field.name());
+                }
+
+            } else if (type instanceof Metamodel.EnumType et) {
+                out.format("class %s(enum.Enum):%n".formatted(type.name()));
+                out.format("    \"\"\"%s\"\"\"%n%n", type.documentation());
+                et.values().forEach(it -> out.format("    %s = None%n".formatted(it)));
+            }
+            out.println();
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index fbbbac93898..71e79884c3d 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -27,5 +27,6 @@ dependencies {
 
 compileJava {
     // for GraalVM options.compilerArgs += ["-Aproject=${project.group}/${project.name}"]
+    options.compilerArgs += ["-parameters"] // for having parameter name in reflection
 }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
new file mode 100644
index 00000000000..b8f61b62272
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -0,0 +1,56 @@
+package org.keyproject.key.api;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+
+/**
+ * <a href="https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow post</a>
+ */
+public class GenericSerializer implements JsonSerializer<Object> /*, JsonDeserializer<Object>*/ {
+
+    private static final String CLASS_PROPERTY_NAME = "$type";
+    private final Gson gson;
+
+    public GenericSerializer() {
+        gson = new Gson();
+    }
+
+    public GenericSerializer(Gson gson) {
+        this.gson = gson;
+    }
+
+    /*
+    @Override
+    public Object deserialize(JsonElement json, Type typeOfT,
+                              JsonDeserializationContext context) throws JsonParseException {
+
+        Class<?> actualClass;
+        if (json.isJsonObject()) {
+            JsonObject jsonObject = json.getAsJsonObject();
+            String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
+            try {
+                actualClass = Class.forName(className);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+                throw new JsonParseException(e.getMessage());
+            }
+        } else {
+            actualClass = typeOfT.getClass();
+        }
+
+        return gson.fromJson(json, actualClass);
+    }
+     */
+
+    @Override
+    public JsonElement serialize(Object src, Type typeOfSrc,
+                                 JsonSerializationContext context) {
+        JsonElement retValue = gson.toJsonTree(src);
+        if (retValue.isJsonObject()) {
+            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getName());
+        }
+        return retValue;
+    }
+
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 7ff86ae2c09..f2a28731d3a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -75,7 +75,8 @@ public KeyApiImpl() {
     @JsonRequest
     public CompletableFuture<List<ExampleDesc>> examples() {
         return CompletableFutures.computeAsync((c) ->
-                ExampleChooser.listExamples(ExampleChooser.lookForExamples()).stream().map(it -> ExampleDesc.from(it)).toList());
+                ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+                        .stream().map(ExampleDesc::from).toList());
     }
 
     @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index b95ae6eebe2..26981875aef 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -26,8 +26,6 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
-    private static KeyAdapter adapter;
-
     //region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
@@ -146,7 +144,9 @@ public void run() {
 
 
     public static void configureJson(GsonBuilder gsonBuilder) {
-        adapter = new KeyAdapter(gsonBuilder);
+        gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
+        gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
+
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
@@ -167,3 +167,4 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
         return launcherBuilder.create();
     }
 }
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 68b330491fc..c17647c9e4f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -48,7 +48,7 @@ public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationCo
         }
     }
 
-    static class FileTypeAdapter extends TypeAdapter<File> {
+    public static class FileTypeAdapter extends TypeAdapter<File> {
         @Override
         public void write(JsonWriter out, File value) throws IOException {
             out.value(value.toString());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 5e5f4f1410b..49e662c6524 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -1,5 +1,7 @@
 package org.keyproject.key.api.remoteclient;
 
+import java.util.List;
+
 public record ShowMessageRequestParams(
         /**
          * The message type. See {@link MessageType}
@@ -15,6 +17,6 @@ public record ShowMessageRequestParams(
          * The message action items to present.
          *
          */
-        MessageActionItem[] actions
+        List<MessageActionItem> actions
 ) {
 }
\ No newline at end of file
diff --git a/keyext.client.python/keyapi/__init__.py b/keyext.client.python/keyapi/__init__.py
index 4a913b39b2e..4807ec5ee59 100644
--- a/keyext.client.python/keyapi/__init__.py
+++ b/keyext.client.python/keyapi/__init__.py
@@ -1,8 +1,8 @@
-from keyapi.rpc import *
+import abc
+from abc import abstractmethod, ABCMeta
+
+from keyapi.keydata import *
+from keyapi.rpc import LspEndpoint
+
 
-class KeyStub(JsonRPCHandler):
-    def __init__(self, input, output):
-        super().__init__(input, output)
 
-    def list_examples(self):
-        return self._send("examples/list", [])
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
new file mode 100644
index 00000000000..dfeaf76f7c7
--- /dev/null
+++ b/keyext.client.python/keyapi/keydata.py
@@ -0,0 +1,533 @@
+from __future__ import annotations
+import enum
+import abc
+import typing
+from abc import abstractmethod, ABCMeta
+
+
+class ExampleDesc:
+    """"""
+
+    name: str
+    """"""
+
+    description: str
+    """"""
+
+    def __init__(self, name, description):
+        self.name = name
+        self.description = description
+
+
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class ProofMacroDesc:
+    """"""
+
+    name: str
+    """"""
+
+    category: str
+    """"""
+
+    description: str
+    """"""
+
+    scriptCommandName: str
+    """"""
+
+    def __init__(self, name, category, description, scriptCommandName):
+        self.name = name
+        self.category = category
+        self.description = description
+        self.scriptCommandName = scriptCommandName
+
+
+class TraceValue(enum.Enum):
+    """"""
+
+    Off = None
+    Message = None
+    All = None
+
+
+class SetTraceParams:
+    """"""
+
+    value: TraceValue
+    """"""
+
+    def __init__(self, value):
+        self.value = value
+
+
+class EnvironmentId:
+    """"""
+
+    envId: str
+    """"""
+
+    def __init__(self, envId):
+        self.envId = envId
+
+
+class ProofId:
+    """"""
+
+    env: EnvironmentId
+    """"""
+
+    proofId: str
+    """"""
+
+    def __init__(self, env, proofId):
+        self.env = env
+        self.proofId = proofId
+
+
+class TreeNodeDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TreeNodeId:
+    """"""
+
+    id: str
+    """"""
+
+    def __init__(self, id):
+        self.id = id
+
+
+class NodeId:
+    """"""
+
+    proofId: ProofId
+    """"""
+
+    nodeId: int
+    """"""
+
+    def __init__(self, proofId, nodeId):
+        self.proofId = proofId
+        self.nodeId = nodeId
+
+
+class PrintOptions:
+    """"""
+
+    unicode: bool
+    """"""
+
+    width: int
+    """"""
+
+    indentation: int
+    """"""
+
+    pure: bool
+    """"""
+
+    termLabels: bool
+    """"""
+
+    def __init__(self, unicode, width, indentation, pure, termLabels):
+        self.unicode = unicode
+        self.width = width
+        self.indentation = indentation
+        self.pure = pure
+        self.termLabels = termLabels
+
+
+class NodeTextId:
+    """"""
+
+    nodeId: NodeId
+    """"""
+
+    nodeTextId: int
+    """"""
+
+    def __init__(self, nodeId, nodeTextId):
+        self.nodeId = nodeId
+        self.nodeTextId = nodeTextId
+
+
+class NodeTextDesc:
+    """"""
+
+    id: NodeTextId
+    """"""
+
+    result: str
+    """"""
+
+    def __init__(self, id, result):
+        self.id = id
+        self.result = result
+
+
+class TermActionId:
+    """"""
+
+    nodeId: NodeId
+    """"""
+
+    pio: str
+    """"""
+
+    id: str
+    """"""
+
+    def __init__(self, nodeId, pio, id):
+        self.nodeId = nodeId
+        self.pio = pio
+        self.id = id
+
+
+class TermActionKind(enum.Enum):
+    """"""
+
+    BuiltIn = None
+    Script = None
+    Macro = None
+    Taclet = None
+
+
+class TermActionDesc:
+    """"""
+
+    commandId: TermActionId
+    """"""
+
+    displayName: str
+    """"""
+
+    description: str
+    """"""
+
+    category: str
+    """"""
+
+    kind: TermActionKind
+    """"""
+
+    def __init__(self, commandId, displayName, description, category, kind):
+        self.commandId = commandId
+        self.displayName = displayName
+        self.description = description
+        self.category = category
+        self.kind = kind
+
+
+class List:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class SortDesc:
+    """"""
+
+    string: str
+    """"""
+
+    documentation: str
+    """"""
+
+    extendsSorts: List
+    """"""
+
+    anAbstract: bool
+    """"""
+
+    s: str
+    """"""
+
+    def __init__(self, string, documentation, extendsSorts, anAbstract, s):
+        self.string = string
+        self.documentation = documentation
+        self.extendsSorts = extendsSorts
+        self.anAbstract = anAbstract
+        self.s = s
+
+
+class FunctionDesc:
+    """"""
+
+    name: str
+    """"""
+
+    sort: str
+    """"""
+
+    retSort: SortDesc
+    """"""
+
+    argSorts: List
+    """"""
+
+    rigid: bool
+    """"""
+
+    unique: bool
+    """"""
+
+    skolemConstant: bool
+    """"""
+
+    def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant):
+        self.name = name
+        self.sort = sort
+        self.retSort = retSort
+        self.argSorts = argSorts
+        self.rigid = rigid
+        self.unique = unique
+        self.skolemConstant = skolemConstant
+
+
+class ContractId:
+    """"""
+
+    envId: EnvironmentId
+    """"""
+
+    contractId: int
+    """"""
+
+    def __init__(self, envId, contractId):
+        self.envId = envId
+        self.contractId = contractId
+
+
+class ContractDesc:
+    """"""
+
+    contractId: ContractId
+    """"""
+
+    name: str
+    """"""
+
+    displayName: str
+    """"""
+
+    typeName: str
+    """"""
+
+    htmlText: str
+    """"""
+
+    plainText: str
+    """"""
+
+    def __init__(self, contractId, name, displayName, typeName, htmlText, plainText):
+        self.contractId = contractId
+        self.name = name
+        self.displayName = displayName
+        self.typeName = typeName
+        self.htmlText = htmlText
+        self.plainText = plainText
+
+
+class LoadParams:
+    """"""
+
+    keyFile: str
+    """"""
+
+    javaFile: str
+    """"""
+
+    classPath: List
+    """"""
+
+    bootClassPath: str
+    """"""
+
+    includes: List
+    """"""
+
+    def __init__(self, keyFile, javaFile, classPath, bootClassPath, includes):
+        self.keyFile = keyFile
+        self.javaFile = javaFile
+        self.classPath = classPath
+        self.bootClassPath = bootClassPath
+        self.includes = includes
+
+
+
+class ProblemDefinition:
+    """"""
+
+    sorts: List
+    """"""
+
+    functions: List
+    """"""
+
+    predicates: List
+    """"""
+
+    antecTerms: List
+    """"""
+
+    succTerms: List
+    """"""
+
+    def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
+        self.sorts = sorts
+        self.functions = functions
+        self.predicates = predicates
+        self.antecTerms = antecTerms
+        self.succTerms = succTerms
+
+
+class LogTraceParams:
+    """"""
+
+    messag: str
+    """"""
+
+    verbose: str
+    """"""
+
+    def __init__(self, messag, verbose):
+        self.messag = messag
+        self.verbose = verbose
+
+
+class MessageType(enum.Enum):
+    """"""
+
+    Unused = None
+    Error = None
+    Warning = None
+    Info = None
+    Log = None
+    Debug = None
+
+
+class ShowMessageParams:
+    """"""
+
+    type: MessageType
+    """"""
+
+    message: str
+    """"""
+
+    def __init__(self, type, message):
+        self.type = type
+        self.message = message
+
+
+class ShowMessageRequestParams:
+    """"""
+
+    type: MessageType
+    """"""
+
+    message: str
+    """"""
+
+    actions: List
+    """"""
+
+    def __init__(self, type, message, actions):
+        self.type = type
+        self.message = message
+        self.actions = actions
+
+
+class MessageActionItem:
+    """"""
+
+    title: str
+    """"""
+
+    def __init__(self, title):
+        self.title = title
+
+
+class Range:
+    """"""
+
+    start: int
+    """"""
+
+    end: int
+    """"""
+
+    def __init__(self, start, end):
+        self.start = start
+        self.end = end
+
+
+class ShowDocumentParams:
+    """"""
+
+    uri: str
+    """"""
+
+    external: bool
+    """"""
+
+    takeFocus: bool
+    """"""
+
+    selection: Range
+    """"""
+
+    def __init__(self, uri, external, takeFocus, selection):
+        self.uri = uri
+        self.external = external
+        self.takeFocus = takeFocus
+        self.selection = selection
+
+
+class ShowDocumentResult:
+    """"""
+
+    success: bool
+    """"""
+
+    def __init__(self, success):
+        self.success = success
+
+
+class TaskFinishedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class TaskStartedInfo:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+KEY_DATA_CLASSES = {"ExampleDesc": ExampleDesc, "ProofScriptCommandDesc": ProofScriptCommandDesc,
+                    "ProofMacroDesc": ProofMacroDesc, "TraceValue": TraceValue, "SetTraceParams": SetTraceParams,
+                    "EnvironmentId": EnvironmentId, "ProofId": ProofId, "TreeNodeDesc": TreeNodeDesc,
+                    "TreeNodeId": TreeNodeId, "NodeId": NodeId, "PrintOptions": PrintOptions, "NodeTextId": NodeTextId,
+                    "NodeTextDesc": NodeTextDesc, "TermActionId": TermActionId, "TermActionKind": TermActionKind,
+                    "TermActionDesc": TermActionDesc, "List": List, "SortDesc": SortDesc, "FunctionDesc": FunctionDesc,
+                    "ContractId": ContractId, "ContractDesc": ContractDesc, "LoadParams": LoadParams,
+                    "ProblemDefinition": ProblemDefinition, "LogTraceParams": LogTraceParams,
+                    "MessageType": MessageType, "ShowMessageParams": ShowMessageParams,
+                    "ShowMessageRequestParams": ShowMessageRequestParams, "MessageActionItem": MessageActionItem,
+                    "Range": Range, "ShowDocumentParams": ShowDocumentParams, "ShowDocumentResult": ShowDocumentResult,
+                    "TaskFinishedInfo": TaskFinishedInfo, "TaskStartedInfo": TaskStartedInfo}
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
index 02ba2be474b..c112055e006 100644
--- a/keyext.client.python/keyapi/rpc.py
+++ b/keyext.client.python/keyapi/rpc.py
@@ -1,10 +1,11 @@
 import enum
 import json
-import sys
 import threading
-from io import TextIOWrapper
+import typing
 from typing import Dict
 
+from keyapi import KEY_DATA_CLASSES
+
 JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
 LEN_HEADER = "Content-Length: "
 TYPE_HEADER = "Content-Type: "
@@ -16,16 +17,20 @@ class MyEncoder(json.JSONEncoder):
     """
 
     def default(self, o):  # pylint: disable=E0202
-        return o.__dict__
+        d = dict(o.__dict__)
+        d['$type'] = type(o).__name__
+        return d
 
 
 class ResponseError(Exception):
-    def __init__(self, error_code, message):
+    def __init__(self, error_code, message, data=None):
         super().__init__(message)
         self.error_code = error_code
+        self.data = data
 
 
 class ErrorCodes(enum.Enum):
+    MethodNotFound = None
     ParseError = 1
 
 
@@ -57,27 +62,27 @@ def send_request(self, message):
 
         :param dict message: The message to send.
         '''
-        json_string = json.dumps(message, cls=MyEncoder)
+        json_string = json.dumps(message , cls=MyEncoder)
         jsonrpc_req = self.__add_header(json_string)
         with self.write_lock:
-            self.stdin.write(jsonrpc_req.encode())
-            self.stdin.flush()
+            self.stdout.write(jsonrpc_req)
+            self.stdout.flush()
 
-    def recv_response(self):
+    def recv_response(self) -> object:
         '''
         Recives a message.
 
         :return: a message
         '''
-        with self.read_lock:
+        with (self.read_lock):
             message_size = None
             while True:
                 # read header
-                line = self.stdout.readline()
+                line = self.stdin.readline()
                 if not line:
                     # server quit
                     return None
-                line = line.decode("utf-8")
+                # line = line.decode("utf-8")
                 if not line.endswith("\r\n"):
                     raise ResponseError(ErrorCodes.ParseError, "Bad header: missing newline")
                 # remove the "\r\n"
@@ -99,12 +104,18 @@ def recv_response(self):
             if not message_size:
                 raise ResponseError(ErrorCodes.ParseError, "Bad header: missing size")
 
-            jsonrpc_res = self.stdout.read(message_size).decode("utf-8")
-            return json.loads(jsonrpc_res)
+            jsonrpc_res = self.stdin.read(message_size)  # .decode("utf-8")
+            return json.loads(jsonrpc_res, object_hook=object_decoder)
+
+
+def object_decoder(obj):
+    if '$type' in obj:
+        return KEY_DATA_CLASSES[obj["$type"]](**obj)
+    return obj
 
 
 class LspEndpoint(threading.Thread):
-    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2):
+    def __init__(self, json_rpc_endpoint: JsonRpcEndpoint, method_callbacks=None, notify_callbacks=None, timeout=2000):
         super().__init__()
         self.json_rpc_endpoint: JsonRpcEndpoint = json_rpc_endpoint
         self.notify_callbacks: Dict = notify_callbacks or {}
@@ -126,6 +137,7 @@ def stop(self):
         self.shutdown_flag = True
 
     def run(self):
+        rpc_id = None
         while not self.shutdown_flag:
             try:
                 jsonrpc_message = self.json_rpc_endpoint.recv_response()
@@ -175,14 +187,14 @@ def send_message(self, method_name, params, id=None):
         message_dict["params"] = params
         self.json_rpc_endpoint.send_request(message_dict)
 
-    def call_method(self, method_name, **kwargs):
+    def call_method(self, method_name, args):
         current_id = self.next_id
         self.next_id += 1
         cond = threading.Condition()
         self.event_dict[current_id] = cond
 
         cond.acquire()
-        self.send_message(method_name, kwargs, current_id)
+        self.send_message(method_name, args, current_id)
         if self.shutdown_flag:
             return None
 
@@ -196,5 +208,17 @@ def call_method(self, method_name, **kwargs):
             raise ResponseError(error.get("code"), error.get("message"), error.get("data"))
         return result
 
-    def send_notification(self, method_name, **kwargs):
+    def send_notification(self, method_name, kwargs):
         self.send_message(method_name, kwargs)
+
+
+class ServerBase:
+    def __init__(self, endpoint: LspEndpoint):
+        self.endpoint = endpoint
+
+    def _call_sync(self, method_name: str, param: typing.List[object]) -> object:
+        resp = self.endpoint.call_method(method_name, param)
+        return resp
+
+    def _call_async(self, method_name: str, param: typing.List[object]):
+        self.endpoint.send_notification(method_name, param)
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
new file mode 100644
index 00000000000..2940363e1c2
--- /dev/null
+++ b/keyext.client.python/keyapi/server.py
@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+import abc
+from abc import abstractmethod
+
+from .keydata import *
+from .rpc import ServerBase, LspEndpoint
+
+
+# noinspection PyTypeChecker
+class KeyServer(ServerBase):
+
+    def __init__(self, endpoint: LspEndpoint):
+        super().__init__(endpoint)
+
+    def env_contracts(self, env: EnvironmentId) -> typing.List[ContractDesc]:
+        """"""
+
+        return self._call_sync("env/contracts", [env])
+
+    def env_functions(self, env: EnvironmentId) -> typing.List[FunctionDesc]:
+        """"""
+
+        return self._call_sync("env/functions", [env])
+
+    def env_openContract(self, contractId: ContractId) -> ProofId:
+        """"""
+
+        return self._call_sync("env/openContract", [contractId])
+
+    def env_sorts(self, env: EnvironmentId) -> typing.List[SortDesc]:
+        """"""
+
+        return self._call_sync("env/sorts", [env])
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+        """"""
+
+        return self._call_sync("examples/list", [])
+
+    def goal_actions(self, id: NodeTextId, pos: int) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self._call_sync("goal/actions", [id, pos])
+
+    def goal_apply_action(self, id: TermActionId) -> typing.List[TermActionDesc]:
+        """"""
+
+        return self._call_sync("goal/apply_action", [id])
+
+    def goal_free(self, id: NodeTextId):
+        """"""
+
+        return self._call_async("goal/free", [id])
+
+    def goal_print(self, id: NodeId, options: PrintOptions) -> NodeTextDesc:
+        """"""
+
+        return self._call_sync("goal/print", [id, options])
+
+    def loading_load(self, params: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+        """"""
+
+        return self._call_sync("loading/load", [params])
+
+    def loading_loadExample(self, id: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadExample", [id])
+
+    def loading_loadKey(self, content: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadKey", [content])
+
+    def loading_loadProblem(self, problem: ProblemDefinition) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadProblem", [problem])
+
+    def loading_loadTerm(self, term: str) -> ProofId:
+        """"""
+
+        return self._call_sync("loading/loadTerm", [term])
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+        """"""
+
+        return self._call_sync("meta/available_macros", [])
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+        """"""
+
+        return self._call_sync("meta/available_script_commands", [])
+
+    def meta_version(self, ) -> str:
+        """"""
+
+        return self._call_sync("meta/version", [])
+
+    def proofTree_children(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self._call_sync("proofTree/children", [proof, nodeId])
+
+    def proofTree_root(self, id: ProofId) -> TreeNodeDesc:
+        """"""
+
+        return self._call_sync("proofTree/root", [id])
+
+    def proofTree_subtree(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
+        """"""
+
+        return self._call_sync("proofTree/subtree", [proof, nodeId])
+
+    def server_exit(self, ):
+        """"""
+
+        return self._call_async("server/exit", [])
+
+    def server_setTrace(self, params: SetTraceParams):
+        """"""
+
+        return self._call_async("server/setTrace", [params])
+
+    def server_shutdown(self, ) -> bool:
+        """"""
+
+        return self._call_sync("server/shutdown", [])
+
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, params: LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, e: str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, params: ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, params: ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, params: ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index a5cb45321d8..d12fadea42a 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -1,5 +1,7 @@
 import socket
-from keyapi import KeyStub, KeyClient
+from keyapi import LspEndpoint, LoadParams
+from keyapi.server import KeyServer
+from keyapi.rpc import JsonRpcEndpoint
 
 if __name__ == "__main__":
     target = ("localhost", 5151)
@@ -8,6 +10,18 @@
         s.connect(target)
         input = s.makefile("r", newline="\r\n")
         output = s.makefile("w", newline="\r\n")
-        stub = KeyStub(input, output)
-        stub.client = KeyClient()
-        print(stub.list_examples())
+
+        rpc_endpoint = JsonRpcEndpoint(input, output)
+        endpoint = LspEndpoint(rpc_endpoint)
+        endpoint.start()
+
+        key = KeyServer(endpoint)
+        print(key.meta_version())
+        ex = key.examples_list()
+        print(ex)
+
+        proofHandle = key.loading_load(
+            LoadParams("/home/weigl/work/key/key.ui/examples/standard_key/prop_log/contraposition.key",
+                       None, None, None, None))
+
+        print(proofHandle)
diff --git a/keyext.client.python/rwtest.py b/keyext.client.python/rwtest.py
deleted file mode 100644
index 312532192dc..00000000000
--- a/keyext.client.python/rwtest.py
+++ /dev/null
@@ -1,402 +0,0 @@
-import enum
-import abc
-import typing
-from abc import abstractmethod
-
-
-class ExampleDesc:
-    """"""
-
-    name: str
-    description: str
-
-
-class ProofScriptCommandDesc:
-    """"""
-
-
-class ProofMacroDesc:
-    """"""
-
-    name: str
-    category: str
-    description: str
-    scriptCommandName: str
-
-
-class TraceValue(enum.Enum):
-    """"""
-
-    Off = None
-    Message = None
-    All = None
-
-
-class SetTraceParams:
-    """"""
-
-    value: TraceValue
-
-
-class EnvironmentId:
-    """"""
-
-    envId: str
-
-
-class ProofId:
-    """"""
-
-    env: EnvironmentId
-    proofId: str
-
-
-class TreeNodeDesc:
-    """"""
-
-
-class TreeNodeId:
-    """"""
-
-    id: str
-
-
-class NodeId:
-    """"""
-
-    proofId: ProofId
-    nodeId: int
-
-
-class PrintOptions:
-    """"""
-
-    unicode: bool
-    width: int
-    indentation: int
-    pure: bool
-    termLabels: bool
-
-
-class NodeTextId:
-    """"""
-
-    nodeId: NodeId
-    nodeTextId: int
-
-
-class NodeTextDesc:
-    """"""
-
-    id: NodeTextId
-    result: str
-
-
-class TermActionId:
-    """"""
-
-    nodeId: NodeId
-    pio: str
-    id: str
-
-
-class TermActionKind(enum.Enum):
-    """"""
-
-    BuiltIn = None
-    Script = None
-    Macro = None
-    Taclet = None
-
-
-class TermActionDesc:
-    """"""
-
-    commandId: TermActionId
-    displayName: str
-    description: str
-    category: str
-    kind: TermActionKind
-
-
-class List:
-    """"""
-
-
-class SortDesc:
-    """"""
-
-    string: str
-    documentation: str
-    extendsSorts: List
-    anAbstract: bool
-    s: str
-
-
-class FunctionDesc:
-    """"""
-
-    name: str
-    sort: str
-    retSort: SortDesc
-    argSorts: List
-    rigid: bool
-    unique: bool
-    skolemConstant: bool
-
-
-class ContractId:
-    """"""
-
-    envId: EnvironmentId
-    contractId: int
-
-
-class ContractDesc:
-    """"""
-
-    contractId: ContractId
-    name: str
-    displayName: str
-    typeName: str
-    htmlText: str
-    plainText: str
-
-
-class LoadParams:
-    """"""
-
-    keyFile: str
-    javaFile: str
-    classPath: List
-    bootClassPath: str
-    includes: List
-
-
-class ProblemDefinition:
-    """"""
-
-    sorts: List
-    functions: List
-    predicates: List
-    antecTerms: List
-    succTerms: List
-
-
-class LogTraceParams:
-    """"""
-
-    messag: str
-    verbose: str
-
-
-class MessageType(enum.Enum):
-    """"""
-
-    Unused = None
-    Error = None
-    Warning = None
-    Info = None
-    Log = None
-    Debug = None
-
-
-class ShowMessageParams:
-    """"""
-
-    type: MessageType
-    message: str
-
-
-
-class ShowMessageRequestParams:
-    """"""
-
-    type: MessageType
-    message: str
-    actions: typing.List[MessageActionItem]
-
-
-class MessageActionItem:
-    """"""
-
-    title: str
-
-
-class Range:
-    """"""
-
-    start: int
-    end: int
-
-
-class ShowDocumentParams:
-    """"""
-
-    uri: str
-    external: bool
-    takeFocus: bool
-    selection: Range
-
-
-class ShowDocumentResult:
-    """"""
-
-    success: bool
-
-
-class TaskFinishedInfo:
-    """"""
-
-
-class TaskStartedInfo:
-    """"""
-
-
-class KeyServer():
-    def env_contracts(self, arg0: EnvironmentId) -> typing.List[ContractDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/contracts", )
-
-    def env_functions(self, arg0: EnvironmentId) -> typing.List[FunctionDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/functions", )
-
-    def env_openContract(self, arg0: ContractId) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("env/openContract", )
-
-    def env_sorts(self, arg0: EnvironmentId) -> typing.List[SortDesc]:
-        """"""
-
-        return self.rpc.call_sync("env/sorts", )
-
-    def examples_list(self, ) -> typing.List[ExampleDesc]:
-        """"""
-
-        return self.rpc.call_sync("examples/list", )
-
-    def goal_actions(self, arg0: NodeTextId, arg1: int) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self.rpc.call_sync("goal/actions", )
-
-    def goal_apply_action(self, arg0: TermActionId) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self.rpc.call_sync("goal/apply_action", )
-
-    def goal_free(self, arg0: NodeTextId):
-        """"""
-
-        return self.rpc.call_async("goal/free", )
-
-    def goal_print(self, arg0: NodeId, arg1: PrintOptions) -> NodeTextDesc:
-        """"""
-
-        return self.rpc.call_sync("goal/print", )
-
-    def loading_load(self, arg0: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
-        """"""
-
-        return self.rpc.call_sync("loading/load", )
-
-    def loading_loadExample(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadExample", )
-
-    def loading_loadKey(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadKey", )
-
-    def loading_loadProblem(self, arg0: ProblemDefinition) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadProblem", )
-
-    def loading_loadTerm(self, arg0: str) -> ProofId:
-        """"""
-
-        return self.rpc.call_sync("loading/loadTerm", )
-
-    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
-        """"""
-
-        return self.rpc.call_sync("meta/available_macros", )
-
-    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
-        """"""
-
-        return self.rpc.call_sync("meta/available_script_commands", )
-
-    def meta_version(self, ) -> str:
-        """"""
-
-        return self.rpc.call_sync("meta/version", )
-
-    def proofTree_children(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self.rpc.call_sync("proofTree/children", )
-
-    def proofTree_root(self, arg0: ProofId) -> TreeNodeDesc:
-        """"""
-
-        return self.rpc.call_sync("proofTree/root", )
-
-    def proofTree_subtree(self, arg0: ProofId, arg1: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self.rpc.call_sync("proofTree/subtree", )
-
-    def server_exit(self, ):
-        """"""
-
-        return self.rpc.call_async("server/exit", )
-
-    def server_setTrace(self, arg0: SetTraceParams):
-        """"""
-
-        return self.rpc.call_async("server/setTrace", )
-
-    def server_shutdown(self, ) -> bool:
-        """"""
-
-        return self.rpc.call_sync("server/shutdown", )
-
-
-class Client(abc.ABCMeta):
-    @abstractmethod
-    def client_logTrace(self, arg0: LogTraceParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sayHello(self, arg0: str):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_showDocument(self, arg0: ShowDocumentParams) -> ShowDocumentResult:
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sm(self, arg0: ShowMessageParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_userResponse(self, arg0: ShowMessageRequestParams) -> MessageActionItem:
-        """"""
-
-        pass
diff --git a/server.py b/server.py
new file mode 100644
index 00000000000..7ad103297fe
--- /dev/null
+++ b/server.py
@@ -0,0 +1,159 @@
+from __future__ import annotations
+from .keydata import *
+from .rpc import ServerBase
+
+import enum
+import abc
+import typing
+from abc import abstractmethod
+class KeyServer(ServerBase):
+
+    def __init__(self, endpoint : LspEndpoint):
+        super().__init__(endpoint)
+
+    def env_contracts(self, env : EnvironmentId) -> typing.List[ContractDesc]:
+       """"""
+
+       return self._call_sync("env/contracts", [env])
+
+    def env_functions(self, env : EnvironmentId) -> typing.List[FunctionDesc]:
+       """"""
+
+       return self._call_sync("env/functions", [env])
+
+    def env_openContract(self, contractId : ContractId) -> ProofId:
+       """"""
+
+       return self._call_sync("env/openContract", [contractId])
+
+    def env_sorts(self, env : EnvironmentId) -> typing.List[SortDesc]:
+       """"""
+
+       return self._call_sync("env/sorts", [env])
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+       """"""
+
+       return self._call_sync("examples/list", [])
+
+    def goal_actions(self, id : NodeTextId, pos : int) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/actions", [id , pos])
+
+    def goal_apply_action(self, id : TermActionId) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/apply_action", [id])
+
+    def goal_free(self, id : NodeTextId):
+        """"""
+
+        return self._call_async("goal/free", [id])
+
+    def goal_print(self, id : NodeId, options : PrintOptions) -> NodeTextDesc:
+       """"""
+
+       return self._call_sync("goal/print", [id , options])
+
+    def loading_load(self, params : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+       """"""
+
+       return self._call_sync("loading/load", [params])
+
+    def loading_loadExample(self, id : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadExample", [id])
+
+    def loading_loadKey(self, content : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadKey", [content])
+
+    def loading_loadProblem(self, problem : ProblemDefinition) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadProblem", [problem])
+
+    def loading_loadTerm(self, term : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadTerm", [term])
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+       """"""
+
+       return self._call_sync("meta/available_macros", [])
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+       """"""
+
+       return self._call_sync("meta/available_script_commands", [])
+
+    def meta_version(self, ) -> str:
+       """"""
+
+       return self._call_sync("meta/version", [])
+
+    def proofTree_children(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/children", [proof , nodeId])
+
+    def proofTree_root(self, id : ProofId) -> TreeNodeDesc:
+       """"""
+
+       return self._call_sync("proofTree/root", [id])
+
+    def proofTree_subtree(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/subtree", [proof , nodeId])
+
+    def server_exit(self, ):
+        """"""
+
+        return self._call_async("server/exit", [])
+
+    def server_setTrace(self, params : SetTraceParams):
+        """"""
+
+        return self._call_async("server/setTrace", [params])
+
+    def server_shutdown(self, ) -> bool:
+       """"""
+
+       return self._call_sync("server/shutdown", [])
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, params : LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, e : str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, params : ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, params : ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, params : ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
+

From 993f90840fab82d74601337f6b1fa9ea463ce3dc Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 3 Nov 2023 17:58:48 +0100
Subject: [PATCH 17/50] add throwable adapter

---
 .../main/java/org/keyproject/key/api/StartServer.java |  2 +-
 .../org/keyproject/key/api/adapters/KeyAdapter.java   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 26981875aef..b0491145cda 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -146,7 +146,7 @@ public void run() {
     public static void configureJson(GsonBuilder gsonBuilder) {
         gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
-
+        gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index c17647c9e4f..67871cec674 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -74,6 +74,17 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
         }
     }
 
+    public static class ThrowableAdapter implements JsonSerializer<Throwable> {
+        @Override
+        public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationContext context) {
+            var obj = new JsonObject();
+            obj.add("$class", context.serialize(src.getClass().getSimpleName()));
+            obj.add("message", context.serialize(src.getMessage()));
+            obj.add("cause", context.serialize(src.getCause()));
+            return obj;
+        }
+    }
+
     /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
         @Override
         public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {

From ae5f2157c79edb37e261d6d23776ffa65c6874e1 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 18 Nov 2023 19:43:59 +0100
Subject: [PATCH 18/50] spotless and merge errors

---
 .../src/main/java/org/key_project/Main.java   |    3 +-
 .../AbstractSymbolicExecutionTestCase.java    | 1546 +++++++++--------
 .../key/control/AbstractProofControl.java     |    3 +-
 .../ilkd/key/control/DefaultProofControl.java |   27 +-
 .../uka/ilkd/key/control/KeYEnvironment.java  |  125 +-
 .../de/uka/ilkd/key/control/ProofControl.java |    5 +-
 .../uka/ilkd/key/macros/ProofMacroFacade.java |    3 +-
 .../key/macros/ProofMacroFinishedInfo.java    |    1 -
 .../scripts/ProofScriptCommandFacade.java     |    4 +-
 .../main/java/de/uka/ilkd/key/proof/Goal.java |    2 +-
 .../main/java/de/uka/ilkd/key/proof/Node.java |   33 +-
 .../speclang/njml/ContractLoadingTests.java   |   27 +-
 .../java/de/uka/ilkd/key/gui/Example.java     |   24 +-
 .../de/uka/ilkd/key/gui/ProofMacroWorker.java |   25 +-
 .../key/gui/actions/RunAllProofsAction.java   |   18 +-
 keyext.api.doc/src/main/java/DocGen.java      |  165 +-
 .../src/main/java/ExtractMetaData.java        |   99 +-
 keyext.api.doc/src/main/java/Metamodel.java   |   86 +-
 .../src/main/java/PythionGenerator.java       |   61 +-
 .../keyproject/key/api/GenericSerializer.java |   55 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  153 +-
 .../org/keyproject/key/api/NodeTextId.java    |    6 +-
 .../org/keyproject/key/api/StartServer.java   |   34 +-
 .../keyproject/key/api/TermActionUtil.java    |   91 +-
 .../key/api/adapters/KeyAdapter.java          |   89 +-
 .../key/api/adapters/package-info.java        |    2 +-
 .../keyproject/key/api/data/ContractDesc.java |    3 +
 .../keyproject/key/api/data/FunctionDesc.java |    7 +-
 .../key/api/data/KeyIdentifications.java      |   33 +-
 .../keyproject/key/api/data/LoadParams.java   |    3 +
 .../key/api/data/MacroDescription.java        |    3 +
 .../key/api/data/MacroStatistic.java          |    8 +-
 .../org/keyproject/key/api/data/NodeDesc.java |    7 +-
 .../keyproject/key/api/data/NodeTextDesc.java |    3 +
 .../key/api/data/PredicateDesc.java           |    3 +
 .../key/api/data/ProblemDefinition.java       |    7 +-
 .../key/api/data/ProofMacroDesc.java          |    3 +
 .../key/api/data/ProofScriptCommandDesc.java  |    3 +
 .../org/keyproject/key/api/data/SortDesc.java |    7 +-
 .../key/api/data/StreategyOptions.java        |    3 +
 .../key/api/data/TermActionDesc.java          |    3 +
 .../key/api/data/TermActionKind.java          |    3 +
 .../keyproject/key/api/data/TraceValue.java   |    3 +
 .../keyproject/key/api/data/TreeNodeDesc.java |    3 +
 .../keyproject/key/api/internal/NodeText.java |    5 +-
 .../keyproject/key/api/remoteapi/EnvApi.java  |    9 +-
 .../key/api/remoteapi/ExampleApi.java         |   10 +-
 .../key/api/remoteapi/ExampleDesc.java        |    3 +
 .../keyproject/key/api/remoteapi/GoalApi.java |   11 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |    6 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |   11 +-
 .../key/api/remoteapi/PrintOptions.java       |    3 +
 .../key/api/remoteapi/ProofApi.java           |   16 +-
 .../key/api/remoteapi/ProofLoadApi.java       |   17 +-
 .../key/api/remoteapi/ProofTreeApi.java       |    9 +-
 .../key/api/remoteapi/ServerManagement.java   |   20 +-
 .../key/api/remoteclient/ClientApi.java       |   34 +-
 .../api/remoteclient/LogMessageParams.java    |    3 +
 .../key/api/remoteclient/LogTraceParams.java  |    3 +
 .../api/remoteclient/MessageActionItem.java   |    3 +
 .../key/api/remoteclient/MessageType.java     |   53 +-
 .../api/remoteclient/ShowDocumentParams.java  |    3 +
 .../api/remoteclient/ShowDocumentResult.java  |    3 +
 .../api/remoteclient/ShowMessageParams.java   |    5 +-
 .../ShowMessageRequestParams.java             |    3 +
 .../org/keyproject/key/api/SimpleClient.java  |   10 +-
 .../java/org/keyproject/key/api/TestRpc.java  |   19 +-
 .../ProofExplorationServiceTest.java          |   38 +-
 .../ilkd/key/gui/testgen/TGInfoDialog.java    |    9 +-
 69 files changed, 1681 insertions(+), 1417 deletions(-)

diff --git a/key.core.example/src/main/java/org/key_project/Main.java b/key.core.example/src/main/java/org/key_project/Main.java
index 4da18d230e9..37530b71aa4 100644
--- a/key.core.example/src/main/java/org/key_project/Main.java
+++ b/key.core.example/src/main/java/org/key_project/Main.java
@@ -131,7 +131,8 @@ private static List<Contract> getContracts(KeYEnvironment<?> env) {
      * @param env the {@link KeYEnvironment} in which to prove the contract
      * @param contract the {@link Contract} to be proven
      */
-    private static void proveContract(KeYEnvironment<?> env, Contract contract) throws InterruptedException {
+    private static void proveContract(KeYEnvironment<?> env, Contract contract)
+            throws InterruptedException {
         Proof proof = null;
         try {
             // Create proof
diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
index 907a15d5c9d..ba7074ce7f7 100644
--- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
+++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
@@ -44,6 +44,7 @@
 import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
 import de.uka.ilkd.key.util.HelperClassForTests;
 import de.uka.ilkd.key.util.KeYConstants;
+
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableArray;
 import org.key_project.util.collection.ImmutableList;
@@ -51,15 +52,11 @@
 import org.key_project.util.helper.FindResources;
 import org.key_project.util.java.CollectionUtil;
 import org.key_project.util.java.StringUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -69,7 +66,7 @@
  */
 public abstract class AbstractSymbolicExecutionTestCase {
     private static final Logger LOGGER =
-            LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
+        LoggerFactory.getLogger(AbstractSymbolicExecutionTestCase.class);
 
     /**
      * <p>
@@ -86,7 +83,7 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * </p>
      */
     public static final boolean CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY =
-            Boolean.getBoolean("UPDATE_TEST_ORACLE");
+        Boolean.getBoolean("UPDATE_TEST_ORACLE");
 
 
     static {
@@ -102,13 +99,13 @@ public abstract class AbstractSymbolicExecutionTestCase {
      * Number of executed SET nodes to execute all in one.
      */
     public static final int ALL_IN_ONE_RUN =
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
+        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN;
 
     /**
      * Number of executed SET nodes for only one SET node per auto mode run.
      */
     public static final int SINGLE_SET_NODE_RUN =
-            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
+        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP;
 
     /**
      * Default stop conditions of executed SET nodes.
@@ -135,9 +132,9 @@ public abstract class AbstractSymbolicExecutionTestCase {
     static {
         // Define fast mode
         if (FAST_MODE) {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN};
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN };
         } else {
-            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[]{ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN};
+            DEFAULT_MAXIMAL_SET_NODES_PER_RUN = new int[] { ALL_IN_ONE_RUN, SINGLE_SET_NODE_RUN };
         }
         // Create temporary director for oracle files if required.
         File directory = null;
@@ -160,18 +157,18 @@ public abstract class AbstractSymbolicExecutionTestCase {
     /**
      * Creates a new oracle file.
      *
-     * @param node                    The node to save as oracle file.
+     * @param node The node to save as oracle file.
      * @param oraclePathInBaseDirFile The path in example directory.
-     * @param saveConstraints         Save constraints?
-     * @param saveVariables           Save variables?
-     * @param saveCallStack           Save call stack?
-     * @param saveReturnValues        Save method return values?
-     * @throws IOException         Occurred Exception
+     * @param saveConstraints Save constraints?
+     * @param saveVariables Save variables?
+     * @param saveCallStack Save call stack?
+     * @param saveReturnValues Save method return values?
+     * @throws IOException Occurred Exception
      * @throws ProofInputException Occurred Exception
      */
     protected static void createOracleFile(IExecutionNode<?> node, String oraclePathInBaseDirFile,
-                                           boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
-                                           boolean saveReturnValues) throws IOException, ProofInputException {
+            boolean saveConstraints, boolean saveVariables, boolean saveCallStack,
+            boolean saveReturnValues) throws IOException, ProofInputException {
         if (tempNewOracleDirectory != null && tempNewOracleDirectory.isDirectory()) {
             // Create sub folder structure
             File oracleFile = new File(tempNewOracleDirectory, oraclePathInBaseDirFile);
@@ -179,7 +176,7 @@ protected static void createOracleFile(IExecutionNode<?> node, String oraclePath
             // Create oracle file
             ExecutionNodeWriter writer = new ExecutionNodeWriter();
             writer.write(node, ExecutionNodeWriter.DEFAULT_ENCODING, oracleFile, saveVariables,
-                    saveCallStack, saveReturnValues, saveConstraints);
+                saveCallStack, saveReturnValues, saveConstraints);
             // Print message to the user.
             printOracleDirectory();
         }
@@ -207,37 +204,37 @@ protected static void printOracleDirectory() {
     /**
      * Makes sure that the given nodes and their subtrees contains the same content.
      *
-     * @param expected            The expected {@link IExecutionNode}.
-     * @param current             The current {@link IExecutionNode}.
-     * @param compareVariables    Compare variables?
-     * @param compareCallStack    Compare call stack?
-     * @param compareChildOrder   Is the order of children relevant?
+     * @param expected The expected {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
+     * @param compareVariables Compare variables?
+     * @param compareCallStack Compare call stack?
+     * @param compareChildOrder Is the order of children relevant?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints  Compare constraints?
+     * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
-                                            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+            boolean compareVariables, boolean compareCallStack, boolean compareChildOrder,
+            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         if (compareChildOrder) {
             // Order of children must be the same.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(expected);
+                new ExecutionNodePreorderIterator(expected);
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(current);
+                new ExecutionNodePreorderIterator(current);
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                        compareCallStack, compareReturnValues, compareConstraints);
+                    compareCallStack, compareReturnValues, compareConstraints);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             // Order of children is not relevant.
             ExecutionNodePreorderIterator expectedExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(expected);
+                new ExecutionNodePreorderIterator(expected);
             Set<IExecutionNode<?>> currentVisitedNodes = new LinkedHashSet<>();
             while (expectedExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
@@ -246,11 +243,11 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
                     fail("Node " + currentNext + " visited twice.");
                 }
                 assertExecutionNode(expectedNext, currentNext, true, compareVariables,
-                        compareCallStack, compareReturnValues, compareConstraints);
+                    compareCallStack, compareReturnValues, compareConstraints);
             }
             // Make sure that each current node was visited
             ExecutionNodePreorderIterator actualExecutionTreeNodeIterator =
-                    new ExecutionNodePreorderIterator(current);
+                new ExecutionNodePreorderIterator(current);
             while (actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 if (!currentVisitedNodes.remove(currentNext)) {
@@ -264,13 +261,13 @@ public static void assertExecutionNodes(IExecutionNode<?> expected, IExecutionNo
     /**
      * Searches the direct or indirect child in subtree of the node to search in.
      *
-     * @param toSearchIn    The node to search in.
+     * @param toSearchIn The node to search in.
      * @param childToSearch The node to search.
      * @return The found node.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearchIn,
-                                                           IExecutionNode<?> childToSearch) throws ProofInputException {
+            IExecutionNode<?> childToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(toSearchIn);
         assertNotNull(childToSearch);
@@ -291,20 +288,20 @@ protected static IExecutionNode<?> searchExecutionNode(IExecutionNode<?> toSearc
             }
         }
         assertNotNull(toSearchIn, "Direct or indirect Child " + childToSearch
-                + " is not contained in " + toSearchIn + ".");
+            + " is not contained in " + toSearchIn + ".");
         return toSearchIn;
     }
 
     /**
      * Searches the direct child. Nodes are equal if the name and the element type is equal.
      *
-     * @param parentToSearchIn    The parent to search in its children.
+     * @param parentToSearchIn The parent to search in its children.
      * @param directChildToSearch The child to search.
      * @return The found child.
      * @throws ProofInputException Occurred Exception.
      */
     protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> parentToSearchIn,
-                                                             IExecutionNode<?> directChildToSearch) throws ProofInputException {
+            IExecutionNode<?> directChildToSearch) throws ProofInputException {
         // Make sure that parameters are valid
         assertNotNull(parentToSearchIn);
         assertNotNull(directChildToSearch);
@@ -318,60 +315,60 @@ protected static IExecutionNode<?> searchDirectChildNode(IExecutionNode<?> paren
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && StringUtil.equalIgnoreWhiteSpace(
-                        ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
-                        ((IExecutionBranchCondition) directChildToSearch)
-                                .getAdditionalBranchLabel())
+                            ((IExecutionBranchCondition) children[i]).getAdditionalBranchLabel(),
+                            ((IExecutionBranchCondition) directChildToSearch)
+                                    .getAdditionalBranchLabel())
                         && children[i].getElementType()
-                        .equals(directChildToSearch.getElementType())) {
+                                .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             } else {
                 if (StringUtil
                         .equalIgnoreWhiteSpace(children[i].getName(), directChildToSearch.getName())
                         && children[i].getElementType()
-                        .equals(directChildToSearch.getElementType())) {
+                                .equals(directChildToSearch.getElementType())) {
                     result = children[i];
                 }
             }
             i++;
         }
         assertNotNull(result,
-                "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
+            "Child " + directChildToSearch + " is not contained in " + parentToSearchIn + ".");
         return result;
     }
 
     /**
      * Makes sure that the given nodes contains the same content. Children are not compared.
      *
-     * @param expected            The expected {@link IExecutionNode}.
-     * @param current             The current {@link IExecutionNode}.
-     * @param compareParent       Compare also the parent node?
-     * @param compareVariables    Compare variables?
-     * @param compareCallStack    Compare call stack?
+     * @param expected The expected {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
+     * @param compareParent Compare also the parent node?
+     * @param compareVariables Compare variables?
+     * @param compareCallStack Compare call stack?
      * @param compareReturnValues Compare return values?
-     * @param compareConstraints  Compare constraints?
+     * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertExecutionNode(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                              boolean compareParent, boolean compareVariables, boolean compareCallStack,
-                                              boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
+            boolean compareParent, boolean compareVariables, boolean compareCallStack,
+            boolean compareReturnValues, boolean compareConstraints) throws ProofInputException {
         // Compare nodes
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
+            "Expected \"" + expected.getName() + "\" but is \"" + current.getName() + "\".");
         assertEquals(expected.isPathConditionChanged(), current.isPathConditionChanged());
         if (!StringUtil.equalIgnoreWhiteSpace(expected.getFormatedPathCondition(),
-                current.getFormatedPathCondition())) {
+            current.getFormatedPathCondition())) {
             assertEquals(expected.getFormatedPathCondition(), current.getFormatedPathCondition());
         }
         if (compareParent) {
             if (expected instanceof IExecutionBlockStartNode<?>) {
                 assertTrue(current instanceof IExecutionBlockStartNode<?>);
                 assertEquals(((IExecutionBlockStartNode<?>) expected).isBlockOpened(),
-                        ((IExecutionBlockStartNode<?>) current).isBlockOpened());
+                    ((IExecutionBlockStartNode<?>) current).isBlockOpened());
                 assertBlockCompletions((IExecutionBlockStartNode<?>) expected,
-                        (IExecutionBlockStartNode<?>) current);
+                    (IExecutionBlockStartNode<?>) current);
             }
             assertCompletedBlocks(expected, current);
             assertOutgoingLinks(expected, current);
@@ -380,177 +377,177 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
         if (expected instanceof IExecutionBaseMethodReturn<?>) {
             assertTrue(current instanceof IExecutionBaseMethodReturn<?>);
             assertCallStateVariables((IExecutionBaseMethodReturn<?>) expected,
-                    (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
+                (IExecutionBaseMethodReturn<?>) current, compareVariables, compareConstraints);
         }
         if (expected instanceof IExecutionBranchCondition) {
             assertTrue(current instanceof IExecutionBranchCondition,
-                    "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
+                "Expected IExecutionBranchCondition but is " + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
-                            ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
-                    "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
-                            + "\" but is \""
-                            + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionBranchCondition) expected).getFormatedBranchCondition(),
+                    ((IExecutionBranchCondition) current).getFormatedBranchCondition()),
+                "Expected \"" + ((IExecutionBranchCondition) expected).getFormatedBranchCondition()
+                    + "\" but is \""
+                    + ((IExecutionBranchCondition) current).getFormatedBranchCondition() + "\".");
             assertEquals(((IExecutionBranchCondition) expected).isMergedBranchCondition(),
-                    ((IExecutionBranchCondition) current).isMergedBranchCondition());
+                ((IExecutionBranchCondition) current).isMergedBranchCondition());
             assertEquals(((IExecutionBranchCondition) expected).isBranchConditionComputed(),
-                    ((IExecutionBranchCondition) current).isBranchConditionComputed());
+                ((IExecutionBranchCondition) current).isBranchConditionComputed());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
-                            ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
-                    "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
-                            + "\" but is \""
-                            + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionBranchCondition) expected).getAdditionalBranchLabel(),
+                    ((IExecutionBranchCondition) current).getAdditionalBranchLabel()),
+                "Expected \"" + ((IExecutionBranchCondition) expected).getAdditionalBranchLabel()
+                    + "\" but is \""
+                    + ((IExecutionBranchCondition) current).getAdditionalBranchLabel() + "\".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStart) {
             assertTrue(current instanceof IExecutionStart, "Expected IExecutionStartNode but is "
-                    + current.getClass() + ".");
+                + current.getClass() + ".");
             assertTerminations((IExecutionStart) expected, (IExecutionStart) current);
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionTermination) {
             assertTrue(current instanceof IExecutionTermination,
-                    "Expected IExecutionTermination but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionTermination but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionTermination) expected).getTerminationKind(),
-                    ((IExecutionTermination) current).getTerminationKind());
+                ((IExecutionTermination) current).getTerminationKind());
             assertEquals(((IExecutionTermination) expected).isBranchVerified(),
-                    ((IExecutionTermination) current).isBranchVerified());
+                ((IExecutionTermination) current).isBranchVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionBranchStatement) {
             assertTrue(current instanceof IExecutionBranchStatement,
-                    "Expected IExecutionBranchStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionBranchStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopCondition) {
             assertTrue(current instanceof IExecutionLoopCondition,
-                    "Expected IExecutionLoopCondition but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopCondition but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopStatement) {
             assertTrue(current instanceof IExecutionLoopStatement,
-                    "Expected IExecutionLoopStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionMethodCall) {
             assertTrue(current instanceof IExecutionMethodCall,
-                    "Expected IExecutionMethodCall but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionMethodCall but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             assertMethodReturns((IExecutionMethodCall) expected, (IExecutionMethodCall) current);
         } else if (expected instanceof IExecutionMethodReturn) {
             assertTrue(current instanceof IExecutionMethodReturn,
-                    "Expected IExecutionMethodReturn but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionMethodReturn but is "
+                    + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
-                            ((IExecutionMethodReturn) current).getSignature()),
-                    ((IExecutionMethodReturn) expected).getSignature() + " does not match "
-                            + ((IExecutionMethodReturn) current).getSignature());
+                StringUtil.equalIgnoreWhiteSpace(((IExecutionMethodReturn) expected).getSignature(),
+                    ((IExecutionMethodReturn) current).getSignature()),
+                ((IExecutionMethodReturn) expected).getSignature() + " does not match "
+                    + ((IExecutionMethodReturn) current).getSignature());
             if (compareReturnValues) {
                 assertTrue(
-                        StringUtil.equalIgnoreWhiteSpace(
-                                ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
-                                ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
-                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
-                                + " does not match "
-                                + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
+                    StringUtil.equalIgnoreWhiteSpace(
+                        ((IExecutionMethodReturn) expected).getNameIncludingReturnValue(),
+                        ((IExecutionMethodReturn) current).getNameIncludingReturnValue()),
+                    ((IExecutionMethodReturn) expected).getNameIncludingReturnValue()
+                        + " does not match "
+                        + ((IExecutionMethodReturn) current).getNameIncludingReturnValue());
                 assertTrue(
-                        StringUtil.equalIgnoreWhiteSpace(
-                                ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
-                                ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
-                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
-                                + " does not match "
-                                + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
+                    StringUtil.equalIgnoreWhiteSpace(
+                        ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue(),
+                        ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue()),
+                    ((IExecutionMethodReturn) expected).getSignatureIncludingReturnValue()
+                        + " does not match "
+                        + ((IExecutionMethodReturn) current).getSignatureIncludingReturnValue());
                 assertEquals(((IExecutionMethodReturn) expected).isReturnValuesComputed(),
-                        ((IExecutionMethodReturn) current).isReturnValuesComputed());
+                    ((IExecutionMethodReturn) current).isReturnValuesComputed());
             }
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
+                StringUtil.equalIgnoreWhiteSpace(
                     ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition(),
                     ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionMethodReturn) expected).getFormattedMethodReturnCondition()
-                            + " does not match "
+                    + " does not match "
                     + ((IExecutionMethodReturn) current).getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
             if (compareReturnValues) {
                 assertReturnValues(((IExecutionMethodReturn) expected).getReturnValues(),
-                        ((IExecutionMethodReturn) current).getReturnValues());
+                    ((IExecutionMethodReturn) current).getReturnValues());
             }
         } else if (expected instanceof IExecutionExceptionalMethodReturn) {
             assertTrue(current instanceof IExecutionExceptionalMethodReturn,
-                    "Expected IExecutionExceptionalMethodReturn but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionExceptionalMethodReturn but is "
+                    + current.getClass() + ".");
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(
-                            ((IExecutionExceptionalMethodReturn) expected).getSignature(),
-                            ((IExecutionExceptionalMethodReturn) current).getSignature()),
-                    ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
-                            + ((IExecutionExceptionalMethodReturn) current).getSignature());
+                StringUtil.equalIgnoreWhiteSpace(
+                    ((IExecutionExceptionalMethodReturn) expected).getSignature(),
+                    ((IExecutionExceptionalMethodReturn) current).getSignature()),
+                ((IExecutionExceptionalMethodReturn) expected).getSignature() + " does not match "
+                    + ((IExecutionExceptionalMethodReturn) current).getSignature());
             assertTrue(StringUtil.equalIgnoreWhiteSpace(
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition(),
                 ((IExecutionExceptionalMethodReturn) current).getFormattedMethodReturnCondition()),
                 ((IExecutionExceptionalMethodReturn) expected).getFormattedMethodReturnCondition()
-                            + " does not match " + ((IExecutionExceptionalMethodReturn) current)
+                    + " does not match " + ((IExecutionExceptionalMethodReturn) current)
                             .getFormattedMethodReturnCondition());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionStatement) {
             assertTrue(current instanceof IExecutionStatement,
-                    "Expected IExecutionStatement but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionStatement but is "
+                    + current.getClass() + ".");
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionOperationContract) {
             assertTrue(current instanceof IExecutionOperationContract,
-                    "Expected IExecutionOperationContract but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionOperationContract but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionOperationContract) expected).isPreconditionComplied(),
-                    ((IExecutionOperationContract) current).isPreconditionComplied());
+                ((IExecutionOperationContract) current).isPreconditionComplied());
             assertEquals(((IExecutionOperationContract) expected).hasNotNullCheck(),
-                    ((IExecutionOperationContract) current).hasNotNullCheck());
+                ((IExecutionOperationContract) current).hasNotNullCheck());
             assertEquals(((IExecutionOperationContract) expected).isNotNullCheckComplied(),
-                    ((IExecutionOperationContract) current).isNotNullCheckComplied());
+                ((IExecutionOperationContract) current).isNotNullCheckComplied());
             assertEquals(((IExecutionOperationContract) expected).getFormatedResultTerm(),
-                    ((IExecutionOperationContract) current).getFormatedResultTerm());
+                ((IExecutionOperationContract) current).getFormatedResultTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedExceptionTerm(),
-                    ((IExecutionOperationContract) current).getFormatedExceptionTerm());
+                ((IExecutionOperationContract) current).getFormatedExceptionTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedSelfTerm(),
-                    ((IExecutionOperationContract) current).getFormatedSelfTerm());
+                ((IExecutionOperationContract) current).getFormatedSelfTerm());
             assertEquals(((IExecutionOperationContract) expected).getFormatedContractParams(),
-                    ((IExecutionOperationContract) current).getFormatedContractParams());
+                ((IExecutionOperationContract) current).getFormatedContractParams());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionLoopInvariant) {
             assertTrue(current instanceof IExecutionLoopInvariant,
-                    "Expected IExecutionLoopInvariant but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionLoopInvariant but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionLoopInvariant) expected).isInitiallyValid(),
-                    ((IExecutionLoopInvariant) current).isInitiallyValid());
+                ((IExecutionLoopInvariant) current).isInitiallyValid());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionAuxiliaryContract) {
             assertTrue(current instanceof IExecutionAuxiliaryContract,
-                    "Expected IExecutionBlockContract but is "
-                            + current.getClass() + ".");
+                "Expected IExecutionBlockContract but is "
+                    + current.getClass() + ".");
             assertEquals(((IExecutionAuxiliaryContract) expected).isPreconditionComplied(),
-                    ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
+                ((IExecutionAuxiliaryContract) current).isPreconditionComplied());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else if (expected instanceof IExecutionJoin) {
             assertTrue(current instanceof IExecutionJoin, "Expected IExecutionJoin but is "
-                    + current.getClass() + ".");
+                + current.getClass() + ".");
             assertEquals(((IExecutionJoin) expected).isWeakeningVerified(),
-                    ((IExecutionJoin) current).isWeakeningVerified());
+                ((IExecutionJoin) current).isWeakeningVerified());
             assertVariables(expected, current, compareVariables, compareConstraints);
             assertConstraints(expected, current, compareConstraints);
         } else {
@@ -562,22 +559,22 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
             IExecutionNode<?>[] currentStack = current.getCallStack();
             if (expectedStack != null) {
                 assertNotNull(currentStack,
-                        "Call stack of \"" + current + "\" should not be null.");
+                    "Call stack of \"" + current + "\" should not be null.");
                 assertEquals(expectedStack.length, currentStack.length, "Node: " + expected);
                 for (int i = 0; i < expectedStack.length; i++) {
                     assertExecutionNode(expectedStack[i], currentStack[i], false, false, false,
-                            false, false);
+                        false, false);
                 }
             } else {
                 assertTrue(currentStack == null || currentStack.length == 0,
-                        "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
-                                + "\" but should be null or empty.");
+                    "Call stack of \"" + current + "\" is \"" + Arrays.toString(currentStack)
+                        + "\" but should be null or empty.");
             }
         }
         // Optionally compare parent
         if (compareParent) {
             assertExecutionNode(expected, current, false, compareVariables, compareCallStack,
-                    compareReturnValues, compareConstraints);
+                compareReturnValues, compareConstraints);
         }
     }
 
@@ -585,7 +582,7 @@ protected static void assertExecutionNode(IExecutionNode<?> expected, IExecution
      * Compares the outgoing links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -594,9 +591,9 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getOutgoingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Outgoing links of \"" + current + "\" should not be null.");
+                "Outgoing links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                    "Outgoing links: " + expected);
+                "Outgoing links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -604,15 +601,15 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                        false, false, false);
+                    false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                        false, false, false);
+                    false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Outgoing links of \""
-                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -620,7 +617,7 @@ protected static void assertOutgoingLinks(IExecutionNode<?> expected, IExecution
      * Compares the incoming links.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecutionNode<?> current)
@@ -629,9 +626,9 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
         ImmutableList<IExecutionLink> currentEntries = current.getIncomingLinks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Incoming links of \"" + current + "\" should not be null.");
+                "Incoming links of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(),
-                    "Incoming links: " + expected);
+                "Incoming links: " + expected);
             Iterator<IExecutionLink> expectedExecutionTreeNodeIterator = expectedEntries.iterator();
             Iterator<IExecutionLink> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
@@ -639,15 +636,15 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
                 IExecutionLink expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionLink currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext.getSource(), currentNext.getSource(), false, false,
-                        false, false, false);
+                    false, false, false);
                 assertExecutionNode(expectedNext.getTarget(), currentNext.getTarget(), false, false,
-                        false, false, false);
+                    false, false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(), "Incoming links of \""
-                    + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
+                + current + "\" is \"" + currentEntries + "\" but should be null or empty.");
         }
     }
 
@@ -655,29 +652,29 @@ protected static void assertIncomingLinks(IExecutionNode<?> expected, IExecution
      * Compares the completed blocks.
      *
      * @param expected The expected {@link IExecutionNode}.
-     * @param current  The current {@link IExecutionNode}.
+     * @param current The current {@link IExecutionNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCompletedBlocks(IExecutionNode<?> expected,
-                                                IExecutionNode<?> current) throws ProofInputException {
+            IExecutionNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionBlockStartNode<?>> expectedEntries = expected.getCompletedBlocks();
         ImmutableList<IExecutionBlockStartNode<?>> currentEntries = current.getCompletedBlocks();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Completed blocks of \"" + current + "\" should not be null.");
+                "Completed blocks of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBlockStartNode<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionBlockStartNode<?>> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 IExecutionBlockStartNode<?> expectedNext = expectedExecutionTreeNodeIterator.next();
                 IExecutionBlockStartNode<?> currentNext = actualExecutionTreeNodeIterator.next();
                 assertExecutionNode(expectedNext, currentNext, false, false,
-                        false, false, false);
+                    false, false, false);
                 String expectedCondition =
-                        expected.getFormatedBlockCompletionCondition(expectedNext);
+                    expected.getFormatedBlockCompletionCondition(expectedNext);
                 String currentCondition = current.getFormatedBlockCompletionCondition(currentNext);
                 if (!StringUtil.equalIgnoreWhiteSpace(expectedCondition, currentCondition)) {
                     assertEquals(expectedCondition, currentCondition);
@@ -687,8 +684,8 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Completed block entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Completed block entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -696,33 +693,33 @@ protected static void assertCompletedBlocks(IExecutionNode<?> expected,
      * Compares the block completions.
      *
      * @param expected The expected {@link IExecutionBlockStartNode}.
-     * @param current  The current {@link IExecutionBlockStartNode}.
+     * @param current The current {@link IExecutionBlockStartNode}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expected,
-                                                 IExecutionBlockStartNode<?> current) throws ProofInputException {
+            IExecutionBlockStartNode<?> current) throws ProofInputException {
         ImmutableList<IExecutionNode<?>> expectedEntries = expected.getBlockCompletions();
         ImmutableList<IExecutionNode<?>> currentEntries = current.getBlockCompletions();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Block completions of \"" + current + "\" should not be null.");
+                "Block completions of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionNode<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionNode<?>> actualExecutionTreeNodeIterator = currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Block completion entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Block completion entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -730,34 +727,34 @@ protected static void assertBlockCompletions(IExecutionBlockStartNode<?> expecte
      * Compares the method returns.
      *
      * @param expected The expected {@link IExecutionMethodCall}.
-     * @param current  The current {@link IExecutionMethodCall}.
+     * @param current The current {@link IExecutionMethodCall}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertMethodReturns(IExecutionMethodCall expected,
-                                              IExecutionMethodCall current) throws ProofInputException {
+            IExecutionMethodCall current) throws ProofInputException {
         ImmutableList<IExecutionBaseMethodReturn<?>> expectedEntries = expected.getMethodReturns();
         ImmutableList<IExecutionBaseMethodReturn<?>> currentEntries = current.getMethodReturns();
         if (expectedEntries != null) {
             assertNotNull(currentEntries,
-                    "Method return of \"" + current + "\" should not be null.");
+                "Method return of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionBaseMethodReturn<?>> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionBaseMethodReturn<?>> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Method return entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Method return entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -765,7 +762,7 @@ protected static void assertMethodReturns(IExecutionMethodCall expected,
      * Compares the terminations.
      *
      * @param expected The expected {@link IExecutionStart}.
-     * @param current  The current {@link IExecutionStart}.
+     * @param current The current {@link IExecutionStart}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertTerminations(IExecutionStart expected, IExecutionStart current)
@@ -776,22 +773,22 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
             assertNotNull(currentEntries, "Termination of \"" + current + "\" should not be null.");
             assertEquals(expectedEntries.size(), currentEntries.size(), "Node: " + expected);
             Iterator<IExecutionTermination> expectedExecutionTreeNodeIterator =
-                    expectedEntries.iterator();
+                expectedEntries.iterator();
             Iterator<IExecutionTermination> actualExecutionTreeNodeIterator =
-                    currentEntries.iterator();
+                currentEntries.iterator();
             while (expectedExecutionTreeNodeIterator.hasNext()
                     && actualExecutionTreeNodeIterator.hasNext()) {
                 assertExecutionNode(expectedExecutionTreeNodeIterator.next(),
-                        actualExecutionTreeNodeIterator.next(),
-                        false, false, false,
-                        false, false);
+                    actualExecutionTreeNodeIterator.next(),
+                    false, false, false,
+                    false, false);
             }
             assertFalse(expectedExecutionTreeNodeIterator.hasNext());
             assertFalse(actualExecutionTreeNodeIterator.hasNext());
         } else {
             assertTrue(currentEntries == null || currentEntries.isEmpty(),
-                    "Termination entries of \"" + current + "\" is \"" + currentEntries
-                            + "\" but should be null or empty.");
+                "Termination entries of \"" + current + "\" is \"" + currentEntries
+                    + "\" but should be null or empty.");
         }
     }
 
@@ -799,11 +796,11 @@ protected static void assertTerminations(IExecutionStart expected, IExecutionSta
      * Makes sure that the given nodes contains the same {@link IExecutionMethodReturnValue}s.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}s.
-     * @param current  The current {@link IExecutionMethodReturnValue}s.
+     * @param current The current {@link IExecutionMethodReturnValue}s.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
-                                             IExecutionMethodReturnValue[] current) throws ProofInputException {
+            IExecutionMethodReturnValue[] current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertEquals(expected.length, current.length);
@@ -816,36 +813,36 @@ protected static void assertReturnValues(IExecutionMethodReturnValue[] expected,
      * Makes sure that the given {@link IExecutionMethodReturnValue}s are the same.
      *
      * @param expected The expected {@link IExecutionMethodReturnValue}.
-     * @param current  The current {@link IExecutionMethodReturnValue}.
+     * @param current The current {@link IExecutionMethodReturnValue}.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertReturnValue(IExecutionMethodReturnValue expected,
-                                            IExecutionMethodReturnValue current) throws ProofInputException {
+            IExecutionMethodReturnValue current) throws ProofInputException {
         assertNotNull(expected);
         assertNotNull(current);
         assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                expected.getName() + " does not match " + current.getName());
+            expected.getName() + " does not match " + current.getName());
         assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
-                        current.getReturnValueString()),
-                expected.getReturnValueString() + " does not match " + current.getReturnValueString());
+            StringUtil.equalIgnoreWhiteSpace(expected.getReturnValueString(),
+                current.getReturnValueString()),
+            expected.getReturnValueString() + " does not match " + current.getReturnValueString());
         assertEquals(expected.hasCondition(), current.hasCondition());
         assertTrue(
-                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                        current.getConditionString()),
-                expected.getConditionString() + " does not match " + current.getConditionString());
+            StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                current.getConditionString()),
+            expected.getConditionString() + " does not match " + current.getConditionString());
     }
 
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionNode}s.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
+     * @param expected The expected node.
+     * @param current The current node.
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                            boolean compareConstraints) throws ProofInputException {
+            boolean compareConstraints) throws ProofInputException {
         if (compareConstraints) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -859,26 +856,26 @@ protected static void assertConstraints(IExecutionNode<?> expected, IExecutionNo
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraints.
-     * @param current  The current constraints.
+     * @param current The current constraints.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraints(IExecutionConstraint[] expected,
-                                            IExecutionConstraint[] current) throws ProofInputException {
+            IExecutionConstraint[] current) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionConstraint> availableCurrentVariables =
-                new ArrayList<>(Arrays.asList(current));
+            new ArrayList<>(Arrays.asList(current));
         for (final IExecutionConstraint expectedVariable : expected) {
             // Find current variable with same name
             IExecutionConstraint currentVariable = CollectionUtil.searchAndRemove(
-                    availableCurrentVariables, element -> {
-                        try {
-                            return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName());
-                        } catch (ProofInputException e) {
-                            throw new RuntimeException(e);
-                        }
-                    });
+                availableCurrentVariables, element -> {
+                    try {
+                        return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
+                            element.getName());
+                    } catch (ProofInputException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
             assertNotNull(currentVariable);
             // Compare variables
             assertConstraint(expectedVariable, currentVariable);
@@ -890,11 +887,11 @@ protected static void assertConstraints(IExecutionConstraint[] expected,
      * Makes sure that the given constraints are the same.
      *
      * @param expected The expected constraint.
-     * @param current  The current constraint.
+     * @param current The current constraint.
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertConstraint(IExecutionConstraint expected,
-                                           IExecutionConstraint current) throws ProofInputException {
+            IExecutionConstraint current) throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             if (!StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName())) {
@@ -909,15 +906,15 @@ protected static void assertConstraint(IExecutionConstraint expected,
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s of the call
      * state.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
-     * @param compareVariables   Compare variables?
+     * @param expected The expected node.
+     * @param current The current node.
+     * @param compareVariables Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> expected,
-                                                   IExecutionBaseMethodReturn<?> current, boolean compareVariables,
-                                                   boolean compareConstraints) throws ProofInputException {
+            IExecutionBaseMethodReturn<?> current, boolean compareVariables,
+            boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -930,14 +927,14 @@ protected static void assertCallStateVariables(IExecutionBaseMethodReturn<?> exp
     /**
      * Makes sure that the given nodes contains the same {@link IExecutionVariable}s.
      *
-     * @param expected           The expected node.
-     * @param current            The current node.
-     * @param compareVariables   Compare variables?
+     * @param expected The expected node.
+     * @param current The current node.
+     * @param compareVariables Compare variables?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode<?> current,
-                                          boolean compareVariables, boolean compareConstraints) throws ProofInputException {
+            boolean compareVariables, boolean compareConstraints) throws ProofInputException {
         if (compareVariables) {
             assertNotNull(expected);
             assertNotNull(current);
@@ -950,27 +947,27 @@ protected static void assertVariables(IExecutionNode<?> expected, IExecutionNode
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected           The expected variables.
-     * @param current            The current variables.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variables.
+     * @param current The current variables.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariables(IExecutionVariable[] expected,
-                                          IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
-                                          boolean compareConstraints) throws ProofInputException {
+            IExecutionVariable[] current, boolean compareParent, boolean compareChildren,
+            boolean compareConstraints) throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
         List<IExecutionVariable> availableCurrentVariables =
-                new ArrayList<>(Arrays.asList(current));
+            new ArrayList<>(Arrays.asList(current));
         for (final IExecutionVariable expectedVariable : expected) {
             // Find current variable with same name
             IExecutionVariable currentVariable = CollectionUtil
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName());
+                                element.getName());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -978,7 +975,7 @@ protected static void assertVariables(IExecutionVariable[] expected,
             assertNotNull(currentVariable);
             // Compare variables
             assertVariable(expectedVariable, currentVariable, compareParent, compareChildren,
-                    compareConstraints);
+                compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -986,15 +983,15 @@ protected static void assertVariables(IExecutionVariable[] expected,
     /**
      * Makes sure that the given variables are the same.
      *
-     * @param expected           The expected variable.
-     * @param current            The current variable.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variable.
+     * @param current The current variable.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertVariable(IExecutionVariable expected, IExecutionVariable current,
-                                         boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
@@ -1005,7 +1002,7 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
             // Compare parent
             if (compareParent) {
                 assertValue(expected.getParentValue(), current.getParentValue(), false, false,
-                        false);
+                    false);
             }
             // Compare children
             if (compareChildren) {
@@ -1021,15 +1018,15 @@ protected static void assertVariable(IExecutionVariable expected, IExecutionVari
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected           The expected values.
-     * @param current            The current values.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected values.
+     * @param current The current values.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValues(IExecutionValue[] expected, IExecutionValue[] current,
-                                       boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         assertEquals(expected.length, current.length);
         // Compare ignore order
@@ -1040,10 +1037,10 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
                     .searchAndRemove(availableCurrentVariables, element -> {
                         try {
                             return StringUtil.equalIgnoreWhiteSpace(expectedVariable.getName(),
-                                    element.getName())
+                                element.getName())
                                     && StringUtil.equalIgnoreWhiteSpace(
-                                    expectedVariable.getConditionString(),
-                                    element.getConditionString());
+                                        expectedVariable.getConditionString(),
+                                        element.getConditionString());
                         } catch (ProofInputException e) {
                             throw new RuntimeException(e);
                         }
@@ -1051,7 +1048,7 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
             assertNotNull(currentVariable);
             // Compare variables
             assertValue(expectedVariable, currentVariable, compareParent, compareChildren,
-                    compareConstraints);
+                compareConstraints);
         }
         assertTrue(availableCurrentVariables.isEmpty());
     }
@@ -1059,43 +1056,43 @@ protected static void assertValues(IExecutionValue[] expected, IExecutionValue[]
     /**
      * Makes sure that the given values are the same.
      *
-     * @param expected           The expected variable.
-     * @param current            The current variable.
-     * @param compareParent      Compare parent?
-     * @param compareChildren    Compare children?
+     * @param expected The expected variable.
+     * @param current The current variable.
+     * @param compareParent Compare parent?
+     * @param compareChildren Compare children?
      * @param compareConstraints Compare constraints?
      * @throws ProofInputException Occurred Exception.
      */
     protected static void assertValue(IExecutionValue expected, IExecutionValue current,
-                                      boolean compareParent, boolean compareChildren, boolean compareConstraints)
+            boolean compareParent, boolean compareChildren, boolean compareConstraints)
             throws ProofInputException {
         if (expected != null) {
             assertNotNull(current);
             // Compare variable
             assertTrue(StringUtil.equalIgnoreWhiteSpace(expected.getName(), current.getName()),
-                    expected.getName() + " does not match " + current.getName());
+                expected.getName() + " does not match " + current.getName());
             assertEquals(expected.getTypeString(), current.getTypeString());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
-                            current.getValueString()),
-                    expected.getValueString() + " does not match " + current.getValueString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getValueString(),
+                    current.getValueString()),
+                expected.getValueString() + " does not match " + current.getValueString());
             assertEquals(expected.isValueAnObject(), current.isValueAnObject());
             assertEquals(expected.isValueUnknown(), current.isValueUnknown());
             assertTrue(
-                    StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
-                            current.getConditionString()),
-                    expected.getConditionString() + " does not match " + current.getConditionString());
+                StringUtil.equalIgnoreWhiteSpace(expected.getConditionString(),
+                    current.getConditionString()),
+                expected.getConditionString() + " does not match " + current.getConditionString());
             // Compare parent
             if (compareParent) {
                 assertVariable(expected.getVariable(), current.getVariable(), false, false,
-                        compareConstraints);
+                    compareConstraints);
             }
             // Compare children
             if (compareChildren) {
                 IExecutionVariable[] expectedChildVariables = expected.getChildVariables();
                 IExecutionVariable[] currentChildVariables = current.getChildVariables();
                 assertVariables(expectedChildVariables, currentChildVariables, compareParent,
-                        compareChildren, compareConstraints);
+                    compareChildren, compareConstraints);
             }
             // Compare constraints
             if (compareConstraints) {
@@ -1112,27 +1109,27 @@ protected static void assertValue(IExecutionValue expected, IExecutionValue curr
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepReturn(DefaultUserInterfaceControl ui,
-                                     SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                     String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
@@ -1142,8 +1139,9 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1154,27 +1152,27 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
      * Executes a "step return" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
-                                                    SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                                    String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir, CompoundStopCondition lineBreakpoints)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepReturnSymbolicExecutionTreeNodesStopCondition());
         stopCondition.addChildren(lineBreakpoints);
         proof.getSettings().getStrategySettings()
@@ -1185,8 +1183,9 @@ protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1196,27 +1195,27 @@ protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
      * Executes a "step over" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void stepOver(DefaultUserInterfaceControl ui,
-                                   SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                   String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         CompoundStopCondition stopCondition = new CompoundStopCondition();
         stopCondition.addChildren(new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN));
         stopCondition.addChildren(new StepOverSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
@@ -1226,8 +1225,9 @@ protected static void stepOver(DefaultUserInterfaceControl ui,
             // Update symbolic execution tree
             builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -1237,28 +1237,28 @@ protected static void stepOver(DefaultUserInterfaceControl ui,
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
      * @return The found {@link SymbolicExecutionCompletions}.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceControl ui,
-                                                           SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
-                                                           String oracleFileExtension, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, int oracleIndex,
+            String oracleFileExtension, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_FOR_ONE_STEP);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
@@ -1268,8 +1268,9 @@ protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceContr
             // Update symbolic execution tree
             SymbolicExecutionCompletions completions = builder.analyse();
             // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
-                    baseDir);
+            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
+                oracleFileExtension,
+                baseDir);
             return completions;
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
@@ -1280,24 +1281,24 @@ protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceContr
      * Executes a "step into" global on all goals on the given
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param ui                      The {@link DefaultUserInterfaceControl} to use.
-     * @param builder                 The {@link SymbolicExecutionGoalChooser} to do step on.
+     * @param ui The {@link DefaultUserInterfaceControl} to use.
+     * @param builder The {@link SymbolicExecutionGoalChooser} to do step on.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void resume(DefaultUserInterfaceControl ui,
-                                 SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
+            SymbolicExecutionTreeBuilder builder, String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         Proof proof = builder.getProof();
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(
-                        ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(
+                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
@@ -1316,20 +1317,20 @@ protected static void resume(DefaultUserInterfaceControl ui,
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-                                                 String oraclePathInBaseDirFile, File baseDir)
+            String oraclePathInBaseDirFile, File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         if (CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
             createOracleFile(builder.getStartNode(), oraclePathInBaseDirFile, false, false, false,
-                    false);
+                false);
         } else {
             // Read oracle file
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
@@ -1338,41 +1339,41 @@ protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builde
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, builder.getStartNode(), false, false, false, false,
-                    false);
+                false);
         }
     }
 
     /**
      * Makes sure that after a step the correct set tree is created.
      *
-     * @param builder                 The {@link SymbolicExecutionTreeBuilder} to test.
+     * @param builder The {@link SymbolicExecutionTreeBuilder} to test.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param oracleIndex             The index of the current step.
-     * @param oracleFileExtension     The oracle file extension
-     * @param baseDir                 The base directory for oracles.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param oracleIndex The index of the current step.
+     * @param oracleFileExtension The oracle file extension
+     * @param baseDir The base directory for oracles.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
+     * @throws SAXException Occurred Exception
      */
     protected static void assertSetTreeAfterStep(SymbolicExecutionTreeBuilder builder,
-                                                 String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
-                                                 File baseDir)
+            String oraclePathInBaseDirFile, int oracleIndex, String oracleFileExtension,
+            File baseDir)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         assertSetTreeAfterStep(builder,
-                oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
+            oraclePathInBaseDirFile + "_" + oracleIndex + oracleFileExtension, baseDir);
     }
 
     /**
      * Searches a {@link IProgramMethod} in the given {@link Services}.
      *
-     * @param services          The {@link Services} to search in.
+     * @param services The {@link Services} to search in.
      * @param containerTypeName The name of the type which contains the method.
-     * @param methodFullName    The method name to search.
+     * @param methodFullName The method name to search.
      * @return The first found {@link IProgramMethod} in the type.
      */
     public static IProgramMethod searchProgramMethod(Services services, String containerTypeName,
-                                                     final String methodFullName) {
+            final String methodFullName) {
         return HelperClassForTests.searchProgramMethod(services, containerTypeName, methodFullName);
     }
 
@@ -1381,29 +1382,29 @@ public static IProgramMethod searchProgramMethod(Services services, String conta
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param baseContractName                    The name of the contract.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param baseContractName The name of the contract.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String baseContractName,
@@ -1417,26 +1418,26 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
-                null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), javaFile,
+            null, null, null, true);
         setupTacletOptions(environment);
         // Start proof
         final Contract contract = environment.getServices().getSpecificationRepository()
                 .getContractByName(baseContractName);
         assertTrue(contract instanceof FunctionalOperationContract);
         ProofOblInput input = new FunctionalOperationContractPO(environment.getInitConfig(),
-                (FunctionalOperationContract) contract, true, true);
+            (FunctionalOperationContract) contract, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1448,30 +1449,30 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The name of the type which contains the method.
-     * @param methodFullName                      The method name to search.
-     * @param precondition                        An optional precondition to use.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The name of the type which contains the method.
+     * @param methodFullName The method name to search.
+     * @param precondition An optional precondition to use.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1485,25 +1486,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodPO(environment.getInitConfig(), pm.getFullName(), pm,
-                precondition, true, true);
+            precondition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1526,26 +1527,26 @@ private static void setupTacletOptions(KeYEnvironment<?> env) {
      * Creates a {@link SymbolicExecutionEnvironment} which consists of loading a proof file to load
      * and creation with configuration of {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofPathInBaseDir                  The path to the proof file inside the base directory.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofPathInBaseDir The path to the proof file inside the base directory.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
      */
@@ -1562,20 +1563,20 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(proofFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
-                null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(truthValueEvaluationEnabled), proofFile,
+            null, null, null, SymbolicExecutionTreeBuilder.createPoPropertiesToForce(), null, true);
         setupTacletOptions(environment);
         Proof proof = environment.getLoadedProof();
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1587,32 +1588,32 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
      * finding the method to proof, instantiation of proof and creation with configuration of
      * {@link SymbolicExecutionTreeBuilder}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The name of the type which contains the method.
-     * @param methodFullName                      The method name to search.
-     * @param precondition                        An optional precondition to use.
-     * @param startPosition                       The start position.
-     * @param endPosition                         The end position.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The name of the type which contains the method.
+     * @param methodFullName The method name to search.
+     * @param precondition An optional precondition to use.
+     * @param startPosition The start position.
+     * @param endPosition The end position.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The created {@link SymbolicExecutionEnvironment}.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> createSymbolicExecutionEnvironment(
             File baseDir, String javaPathInBaseDir, String containerTypeName, String methodFullName,
@@ -1627,25 +1628,25 @@ protected static SymbolicExecutionEnvironment<DefaultUserInterfaceControl> creat
         assertTrue(javaFile.exists());
         // Load java file
         KeYEnvironment<DefaultUserInterfaceControl> environment = KeYEnvironment.load(
-                SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
+            SymbolicExecutionJavaProfile.getDefaultInstance(), javaFile, null, null, null, true);
         setupTacletOptions(environment);
         // Search method to proof
         IProgramMethod pm =
-                searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
+            searchProgramMethod(environment.getServices(), containerTypeName, methodFullName);
         // Start proof
         ProofOblInput input = new ProgramMethodSubsetPO(environment.getInitConfig(), methodFullName,
-                pm, precondition, startPosition, endPosition, true, true);
+            pm, precondition, startPosition, endPosition, true, true);
         Proof proof = environment.createProof(input);
         assertNotNull(proof);
         // Set strategy and goal chooser to use for auto mode
         SymbolicExecutionEnvironment.configureProofForSymbolicExecution(proof,
-                ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
-                useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                nonExecutionBranchHidingSideProofs, aliasChecks);
+            ExecutedSymbolicExecutionTreeNodesStopCondition.MAXIMAL_NUMBER_OF_SET_NODES_TO_EXECUTE_PER_GOAL_IN_COMPLETE_RUN,
+            useOperationContracts, useLoopInvariants, blockTreatmentContract,
+            nonExecutionBranchHidingSideProofs, aliasChecks);
         // Create symbolic execution tree which contains only the start node at beginning
         SymbolicExecutionTreeBuilder builder =
-                new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
-                        usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            new SymbolicExecutionTreeBuilder(proof, mergeBranchConditions, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
         SymbolicExecutionUtil.initializeStrategy(builder);
         builder.analyse();
         assertNotNull(builder.getStartNode());
@@ -1670,7 +1671,7 @@ protected String getTryContent(Proof proof) {
         JavaProgramElement updateContent = updateApplication.subs().get(1).javaBlock().program();
         assertTrue(updateContent instanceof StatementBlock);
         ImmutableArray<? extends Statement> updateContentBody =
-                ((StatementBlock) updateContent).getBody();
+            ((StatementBlock) updateContent).getBody();
         assertEquals(2, updateContentBody.size());
         assertTrue(updateContentBody.get(1) instanceof Try);
         Try tryStatement = (Try) updateContentBody.get(1);
@@ -1681,39 +1682,39 @@ protected String getTryContent(Proof proof) {
     /**
      * Makes sure that the save and loading process works.
      *
-     * @param baseDir                 The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir       The path to the java file inside the base directory.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
      * @param oraclePathInBaseDirFile The oracle path.
-     * @param env                     The already executed {@link SymbolicExecutionEnvironment} which contains the proof
-     *                                to save/load.
-     * @throws IOException                  Occurred Exception
-     * @throws ProofInputException          Occurred Exception
+     * @param env The already executed {@link SymbolicExecutionEnvironment} which contains the proof
+     *        to save/load.
+     * @throws IOException Occurred Exception
+     * @throws ProofInputException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
-                                       String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
+            String oraclePathInBaseDirFile, SymbolicExecutionEnvironment<?> env)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         File javaFile = new File(baseDir, javaPathInBaseDir);
         assertTrue(javaFile.exists());
         File tempFile =
-                File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
+            File.createTempFile("TestProgramMethodSubsetPO", ".proof", javaFile.getParentFile());
         KeYEnvironment<DefaultUserInterfaceControl> reloadedEnv = null;
         SymbolicExecutionTreeBuilder reloadedBuilder = null;
         try {
             ProofSaver saver = new ProofSaver(env.getProof(), tempFile.getAbsolutePath(),
-                    KeYConstants.INTERNAL_VERSION);
+                KeYConstants.INTERNAL_VERSION);
             assertNull(saver.save());
             // Load proof from saved *.proof file
             reloadedEnv = KeYEnvironment.load(SymbolicExecutionJavaProfile.getDefaultInstance(),
-                    tempFile, null, null, null, true);
+                tempFile, null, null, null, true);
             Proof reloadedProof = reloadedEnv.getLoadedProof();
             assertNotSame(env.getProof(), reloadedProof);
             // Recreate symbolic execution tree
             reloadedBuilder =
-                    new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
+                new SymbolicExecutionTreeBuilder(reloadedProof, false, false, false, false, true);
             SymbolicExecutionUtil.initializeStrategy(reloadedBuilder);
             reloadedBuilder.analyse();
             assertSetTreeAfterStep(reloadedBuilder, oraclePathInBaseDirFile, baseDir);
@@ -1742,59 +1743,59 @@ protected void assertSaveAndReload(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                               The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                     The path to the java file inside the base directory.
-     * @param containerTypeName                     The java class to test.
-     * @param methodFullName                        The method to test.
-     * @param precondition                          An optional precondition.
-     * @param oraclePathInBaseDirFile               The path to the oracle file inside the base directory.
-     * @param includeConstraints                    Include constraints?
-     * @param includeVariables                      Include variables?
-     * @param includeCallStack                      Include call stack?
-     * @param includeReturnValues                   Include method return values?
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
      * @param maximalNumberOfExecutedSetNodesPerRun The number of executed set nodes per auto mode
-     *                                              run. The whole test is executed for each defined value.
-     * @param mergeBranchConditions                 Merge branch conditions?
-     * @param useOperationContracts                 Use operation contracts?
-     * @param useLoopInvariants                     Use loop invariants?
-     * @param blockTreatmentContract                Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs    {@code true} hide non execution branch labels by
-     *                                              side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                           Do alias checks?
-     * @param useUnicode                            {@code true} use unicode characters, {@code false} do not use unicode
-     *                                              characters.
-     * @param usePrettyPrinting                     {@code true} use pretty printing, {@code false} do not use pretty
-     *                                              printing.
-     * @param variablesAreOnlyComputedFromUpdates   {@code true} {@link IExecutionVariable} are only
-     *                                              computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                              according to the type structure of the visible memory.
-     * @param simplifyConditions                    {@code true} simplify conditions, {@code false} do not simplify
-     *                                              conditions.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        run. The whole test is executed for each defined value.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
+     * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTest(File baseDir, String javaPathInBaseDir, String containerTypeName,
-                             String methodFullName, String precondition, String oraclePathInBaseDirFile,
-                             boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                             boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
-                             boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-                             boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                             boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                             boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String methodFullName, String precondition, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, int[] maximalNumberOfExecutedSetNodesPerRun,
+            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         assertNotNull(maximalNumberOfExecutedSetNodesPerRun);
         for (int j : maximalNumberOfExecutedSetNodesPerRun) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env = doSETTest(baseDir,
-                    javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                    oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                    includeReturnValues, j,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
+                javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                includeReturnValues, j,
+                mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, simplifyConditions);
             env.dispose();
         }
     }
@@ -1803,57 +1804,57 @@ protected void doSETTest(File baseDir, String javaPathInBaseDir, String containe
      * Executes method <code>doTest</code>
      * and disposes the created {@link SymbolicExecutionEnvironment}.
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The java class to test.
-     * @param methodFullName                      The method to test.
-     * @param precondition                        An optional precondition.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
-                                       String containerTypeName, String methodFullName, String precondition,
-                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-                                       boolean includeCallStack, boolean includeReturnValues,
-                                       int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-                                       boolean useOperationContracts, boolean useLoopInvariants,
-                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                       boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String containerTypeName, String methodFullName, String precondition,
+            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+            boolean includeCallStack, boolean includeReturnValues,
+            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
-                        oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
-                        includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
-                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                        variablesAreOnlyComputedFromUpdates, simplifyConditions);
+            doSETTest(baseDir, javaPathInBaseDir, containerTypeName, methodFullName, precondition,
+                oraclePathInBaseDirFile, includeConstraints, includeVariables, includeCallStack,
+                includeReturnValues, maximalNumberOfExecutedSetNodes, mergeBranchConditions,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                variablesAreOnlyComputedFromUpdates, simplifyConditions);
         env.dispose();
     }
 
@@ -1870,47 +1871,47 @@ protected void doSETTestAndDispose(File baseDir, String javaPathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
-                                       String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
-                                       boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
-                                       boolean useOperationContracts, boolean useLoopInvariants,
-                                       boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                       boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                       boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
+            String oraclePathInBaseDirFile, boolean includeConstraints, boolean includeVariables,
+            boolean includeCallStack, boolean includeReturnValues, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
-                        includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
-                        useOperationContracts, useLoopInvariants, blockTreatmentContract,
-                        nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
-                        variablesAreOnlyComputedFromUpdates, false, true);
+            doSETTest(baseDir, proofFilePathInBaseDir, oraclePathInBaseDirFile, includeConstraints,
+                includeVariables, includeCallStack, includeReturnValues, mergeBranchConditions,
+                useOperationContracts, useLoopInvariants, blockTreatmentContract,
+                nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode, usePrettyPrinting,
+                variablesAreOnlyComputedFromUpdates, false, true);
         if (env != null) {
             env.dispose();
         }
@@ -1929,47 +1930,47 @@ protected void doSETTestAndDispose(File baseDir, String proofFilePathInBaseDir,
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param proofFilePathInBaseDir              The path to the proof file inside the base directory.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param proofFilePathInBaseDir The path to the proof file inside the base directory.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
-                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                                                                  boolean includeReturnValues, boolean mergeBranchConditions,
-                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
+            String proofFilePathInBaseDir, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+            boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         boolean originalOneStepSimplification = isOneStepSimplificationEnabled(null);
         SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env;
@@ -1980,26 +1981,26 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             // Make sure that the correct taclet options are defined.
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             env = createSymbolicExecutionEnvironment(baseDir, proofFilePathInBaseDir,
-                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
-                    usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
-                    simplifyConditions);
+                mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks, useUnicode,
+                usePrettyPrinting, variablesAreOnlyComputedFromUpdates, truthValueEvaluationEnabled,
+                simplifyConditions);
             // Create new oracle file if required in a temporary directory
             createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                    includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
             // Read oracle file
             ExecutionNodeReader reader = new ExecutionNodeReader();
             IExecutionNode<?> oracleRoot = reader.read(oracleFile);
             assertNotNull(oracleRoot);
             // Make sure that the created symbolic execution tree matches the expected one.
             assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                    includeCallStack, false, includeReturnValues, includeConstraints);
+                includeCallStack, false, includeReturnValues, includeConstraints);
             return env;
         } finally {
             // Restore original options
@@ -2020,49 +2021,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param containerTypeName                   The java class to test.
-     * @param methodFullName                      The method to test.
-     * @param precondition                        An optional precondition.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param containerTypeName The java class to test.
+     * @param methodFullName The method to test.
+     * @param precondition An optional precondition.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String javaPathInBaseDir, String containerTypeName, final String methodFullName,
-                                                                                  String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
-                                                                                  boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
-                                                                                  int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
-                                                                                  boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
+            String javaPathInBaseDir, String containerTypeName, final String methodFullName,
+            String precondition, String oraclePathInBaseDirFile, boolean includeConstraints,
+            boolean includeVariables, boolean includeCallStack, boolean includeReturnValues,
+            int maximalNumberOfExecutedSetNodes, boolean mergeBranchConditions,
+            boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean simplifyConditions)
             throws ProofInputException, IOException, ParserConfigurationException, SAXException,
             ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
@@ -2076,23 +2077,23 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions = setDefaultTacletOptions(baseDir, javaPathInBaseDir,
-                    containerTypeName, methodFullName);
+                containerTypeName, methodFullName);
             setOneStepSimplificationEnabled(null, true);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                            methodFullName, precondition, mergeBranchConditions, useOperationContracts,
-                            useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
-                            aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                            simplifyConditions);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                    methodFullName, precondition, mergeBranchConditions, useOperationContracts,
+                    useLoopInvariants, blockTreatmentContract, nonExecutionBranchHidingSideProofs,
+                    aliasChecks, useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                    simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                    includeCallStack, includeReturnValues);
+                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore original options
@@ -2114,49 +2115,49 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * <li>Compare created symbolic execution tree with oracle model</li>
      * </ol>
      *
-     * @param baseDir                             The base directory which contains test and oracle file.
-     * @param javaPathInBaseDir                   The path to the java file inside the base directory.
-     * @param baseContractName                    The name of the contract.
-     * @param oraclePathInBaseDirFile             The path to the oracle file inside the base directory.
-     * @param includeConstraints                  Include constraints?
-     * @param includeVariables                    Include variables?
-     * @param includeCallStack                    Include call stack?
-     * @param includeReturnValues                 Include method return values?
-     * @param maximalNumberOfExecutedSetNodes     The number of executed set nodes per auto mode run.
-     * @param mergeBranchConditions               Merge branch conditions?
-     * @param useOperationContracts               Use operation contracts?
-     * @param useLoopInvariants                   Use loop invariants?
-     * @param blockTreatmentContract              Block contracts or expand otherwise?
-     * @param nonExecutionBranchHidingSideProofs  {@code true} hide non execution branch labels by
-     *                                            side proofs, {@code false} do not hide execution branch labels.
-     * @param aliasChecks                         Do alias checks?
-     * @param useUnicode                          {@code true} use unicode characters, {@code false} do not use unicode
-     *                                            characters.
-     * @param usePrettyPrinting                   {@code true} use pretty printing, {@code false} do not use pretty
-     *                                            printing.
+     * @param baseDir The base directory which contains test and oracle file.
+     * @param javaPathInBaseDir The path to the java file inside the base directory.
+     * @param baseContractName The name of the contract.
+     * @param oraclePathInBaseDirFile The path to the oracle file inside the base directory.
+     * @param includeConstraints Include constraints?
+     * @param includeVariables Include variables?
+     * @param includeCallStack Include call stack?
+     * @param includeReturnValues Include method return values?
+     * @param maximalNumberOfExecutedSetNodes The number of executed set nodes per auto mode run.
+     * @param mergeBranchConditions Merge branch conditions?
+     * @param useOperationContracts Use operation contracts?
+     * @param useLoopInvariants Use loop invariants?
+     * @param blockTreatmentContract Block contracts or expand otherwise?
+     * @param nonExecutionBranchHidingSideProofs {@code true} hide non execution branch labels by
+     *        side proofs, {@code false} do not hide execution branch labels.
+     * @param aliasChecks Do alias checks?
+     * @param useUnicode {@code true} use unicode characters, {@code false} do not use unicode
+     *        characters.
+     * @param usePrettyPrinting {@code true} use pretty printing, {@code false} do not use pretty
+     *        printing.
      * @param variablesAreOnlyComputedFromUpdates {@code true} {@link IExecutionVariable} are only
-     *                                            computed from updates, {@code false} {@link IExecutionVariable}s are computed
-     *                                            according to the type structure of the visible memory.
-     * @param truthValueEvaluationEnabled         {@code true} truth value evaluation is enabled,
-     *                                            {@code false} truth value evaluation is disabled.
-     * @param simplifyConditions                  {@code true} simplify conditions, {@code false} do not simplify
-     *                                            conditions.
+     *        computed from updates, {@code false} {@link IExecutionVariable}s are computed
+     *        according to the type structure of the visible memory.
+     * @param truthValueEvaluationEnabled {@code true} truth value evaluation is enabled,
+     *        {@code false} truth value evaluation is disabled.
+     * @param simplifyConditions {@code true} simplify conditions, {@code false} do not simplify
+     *        conditions.
      * @return The tested {@link SymbolicExecutionEnvironment}.
-     * @throws ProofInputException          Occurred Exception
-     * @throws IOException                  Occurred Exception
+     * @throws ProofInputException Occurred Exception
+     * @throws IOException Occurred Exception
      * @throws ParserConfigurationException Occurred Exception
-     * @throws SAXException                 Occurred Exception
-     * @throws ProblemLoaderException       Occurred Exception
+     * @throws SAXException Occurred Exception
+     * @throws ProblemLoaderException Occurred Exception
      */
     protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(File baseDir,
-                                                                                  String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
-                                                                                  boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                                                                  boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
-                                                                                  boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
-                                                                                  boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
-                                                                                  boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
-                                                                                  boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
-                                                                                  boolean simplifyConditions) throws ProofInputException, IOException,
+            String javaPathInBaseDir, String baseContractName, String oraclePathInBaseDirFile,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues, int maximalNumberOfExecutedSetNodes,
+            boolean mergeBranchConditions, boolean useOperationContracts, boolean useLoopInvariants,
+            boolean blockTreatmentContract, boolean nonExecutionBranchHidingSideProofs,
+            boolean aliasChecks, boolean useUnicode, boolean usePrettyPrinting,
+            boolean variablesAreOnlyComputedFromUpdates, boolean truthValueEvaluationEnabled,
+            boolean simplifyConditions) throws ProofInputException, IOException,
             ParserConfigurationException, SAXException, ProblemLoaderException {
         Map<String, String> originalTacletOptions = null;
         try {
@@ -2167,22 +2168,22 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
             File oracleFile = new File(baseDir, oraclePathInBaseDirFile);
             if (!CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY) {
                 assertTrue(oracleFile.exists(),
-                        "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
+                    "Oracle file does not exist. Set \"CREATE_NEW_ORACLE_FILES_IN_TEMP_DIRECTORY\" to true to create an oracle file.");
             }
             assertTrue(maximalNumberOfExecutedSetNodes >= 1);
             // Make sure that the correct taclet options are defined.
             originalTacletOptions =
-                    setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
+                setDefaultTacletOptions(javaPathInBaseDir, baseContractName);
             // Create proof environment for symbolic execution
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
-                            mergeBranchConditions, useOperationContracts, useLoopInvariants,
-                            blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
-                            useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
-                            truthValueEvaluationEnabled, simplifyConditions);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, baseContractName,
+                    mergeBranchConditions, useOperationContracts, useLoopInvariants,
+                    blockTreatmentContract, nonExecutionBranchHidingSideProofs, aliasChecks,
+                    useUnicode, usePrettyPrinting, variablesAreOnlyComputedFromUpdates,
+                    truthValueEvaluationEnabled, simplifyConditions);
             internalDoSETTest(oracleFile, env, oraclePathInBaseDirFile,
-                    maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
-                    includeCallStack, includeReturnValues);
+                maximalNumberOfExecutedSetNodes, includeConstraints, includeVariables,
+                includeCallStack, includeReturnValues);
             return env;
         } finally {
             // Restore taclet options
@@ -2194,15 +2195,15 @@ protected SymbolicExecutionEnvironment<DefaultUserInterfaceControl> doSETTest(Fi
      * Internal test method
      */
     private void internalDoSETTest(File oracleFile,
-                                   SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
-                                   String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
-                                   boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
-                                   boolean includeReturnValues)
+            SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env,
+            String oraclePathInBaseDirFile, int maximalNumberOfExecutedSetNodes,
+            boolean includeConstraints, boolean includeVariables, boolean includeCallStack,
+            boolean includeReturnValues)
             throws IOException, ProofInputException, ParserConfigurationException, SAXException {
         // Set stop condition to stop after a number of detected symbolic execution tree nodes
         // instead of applied rules
         ExecutedSymbolicExecutionTreeNodesStopCondition stopCondition =
-                new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
+            new ExecutedSymbolicExecutionTreeNodesStopCondition(maximalNumberOfExecutedSetNodes);
         env.getProof().getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         int nodeCount;
@@ -2218,11 +2219,12 @@ private void internalDoSETTest(File oracleFile,
                 // Update symbolic execution tree
                 env.getBuilder().analyse();
                 // Make sure that not to many set nodes are executed
-                Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
+                Map<Goal, Integer> executedSetNodesPerGoal =
+                    stopCondition.getExectuedSetNodesPerGoal();
                 for (Integer value : executedSetNodesPerGoal.values()) {
                     assertNotNull(value);
                     assertTrue(value <= maximalNumberOfExecutedSetNodes,
-                            value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
+                        value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
                 }
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
@@ -2230,36 +2232,36 @@ private void internalDoSETTest(File oracleFile,
         } while (stopCondition.wasSetNodeExecuted() && nodeCount != env.getProof().countNodes());
         // Create new oracle file if required in a temporary directory
         createOracleFile(env.getBuilder().getStartNode(), oraclePathInBaseDirFile,
-                includeConstraints, includeVariables, includeCallStack, includeReturnValues);
+            includeConstraints, includeVariables, includeCallStack, includeReturnValues);
         // Read oracle file
         ExecutionNodeReader reader = new ExecutionNodeReader();
         IExecutionNode<?> oracleRoot = reader.read(oracleFile);
         assertNotNull(oracleRoot);
         // Make sure that the created symbolic execution tree matches the expected one.
         assertExecutionNodes(oracleRoot, env.getBuilder().getStartNode(), includeVariables,
-                includeCallStack, false, includeReturnValues, includeConstraints);
+            includeCallStack, false, includeReturnValues, includeConstraints);
     }
 
     /**
      * Ensures that the default taclet options are defined.
      *
      * @param javaPathInBaseDir The path in the base directory to the java file.
-     * @param baseContractName  The name of the contract to prove.
+     * @param baseContractName The name of the contract to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseDir,
-                                                              String baseContractName)
+            String baseContractName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
-                            baseContractName,
-                            false, false, false,
-                            false, false, false,
-                            false, false, false,
-                            false, false);
+                createSymbolicExecutionEnvironment(testCaseDirectory, javaPathInBaseDir,
+                    baseContractName,
+                    false, false, false,
+                    false, false, false,
+                    false, false, false,
+                    false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2268,26 +2270,26 @@ public static Map<String, String> setDefaultTacletOptions(String javaPathInBaseD
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param baseDir           The base directory which contains the java file.
+     * @param baseDir The base directory which contains the java file.
      * @param javaPathInBaseDir The path in the base directory to the java file.
      * @param containerTypeName name of the type where the method is implemented/declared
-     * @param methodFullName    The method to prove.
+     * @param methodFullName The method to prove.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     public static Map<String, String> setDefaultTacletOptions(File baseDir,
-                                                              String javaPathInBaseDir,
-                                                              String containerTypeName,
-                                                              String methodFullName)
+            String javaPathInBaseDir,
+            String containerTypeName,
+            String methodFullName)
             throws ProblemLoaderException, ProofInputException {
         if (!SymbolicExecutionUtil.isChoiceSettingInitialised()) {
             SymbolicExecutionEnvironment<DefaultUserInterfaceControl> env =
-                    createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
-                            methodFullName,
-                            null, false, false, false,
-                            false, false, false, false,
-                            false, false, false);
+                createSymbolicExecutionEnvironment(baseDir, javaPathInBaseDir, containerTypeName,
+                    methodFullName,
+                    null, false, false, false,
+                    false, false, false, false,
+                    false, false, false);
             env.dispose();
         }
         return setDefaultTacletOptions();
@@ -2296,19 +2298,19 @@ public static Map<String, String> setDefaultTacletOptions(File baseDir,
     /**
      * Ensures that the default taclet options are defined.
      *
-     * @param javaFile          The java file to load.
+     * @param javaFile The java file to load.
      * @param containerTypeName The type name which provides the target.
-     * @param targetName        The target to proof.
+     * @param targetName The target to proof.
      * @return The original settings which are overwritten.
      * @throws ProblemLoaderException Occurred Exception.
-     * @throws ProofInputException    Occurred Exception.
+     * @throws ProofInputException Occurred Exception.
      */
     @SuppressWarnings("unused")
     public static Map<String, String> setDefaultTacletOptionsForTarget(File javaFile,
-                                                                       String containerTypeName, final String targetName)
+            String containerTypeName, final String targetName)
             throws ProblemLoaderException, ProofInputException {
         return HelperClassForTests.setDefaultTacletOptionsForTarget(javaFile, containerTypeName,
-                targetName);
+            targetName);
     }
 
     /**
@@ -2342,14 +2344,14 @@ public static void restoreTacletOptions(Map<String, String> options) {
     protected ITermProgramVariableCollectorFactory createNewProgramVariableCollectorFactory(
             final SymbolicExecutionBreakpointStopCondition breakpointParentStopCondition) {
         return services -> new TermProgramVariableCollectorKeepUpdatesForBreakpointconditions(
-                services, breakpointParentStopCondition);
+            services, breakpointParentStopCondition);
     }
 
     /**
      * Makes sure that two {@link Term}s are equal.
      *
      * @param expected The expected {@link Term}.
-     * @param actual   The actual {@link Term}.
+     * @param actual The actual {@link Term}.
      */
     protected void assertTerm(Term expected, Term actual) {
         if (expected != null) {
@@ -2369,7 +2371,7 @@ protected void assertTerm(Term expected, Term actual) {
      * Checks if one-step simplification is enabled in the given {@link Proof}.
      *
      * @param proof The {@link Proof} to read from or {@code null} to return the general settings
-     *              value.
+     *        value.
      * @return {@code true} one step simplification is enabled, {@code false} if disabled.
      */
     public static boolean isOneStepSimplificationEnabled(Proof proof) {
@@ -2379,9 +2381,9 @@ public static boolean isOneStepSimplificationEnabled(Proof proof) {
     /**
      * Defines if one-step simplification is enabled in general and within the {@link Proof}.
      *
-     * @param proof   The optional {@link Proof}.
+     * @param proof The optional {@link Proof}.
      * @param enabled {@code true} use one-step simplification, {@code false} do not use one-step
-     *                simplification.
+     *        simplification.
      */
     public static void setOneStepSimplificationEnabled(Proof proof, boolean enabled) {
         HelperClassForTests.setOneStepSimplificationEnabled(proof, enabled);
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
index 29a34424d09..e466b3e4876 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
@@ -564,7 +564,8 @@ public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException {
+    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
+            throws InterruptedException {
         startAutoMode(proof, goals);
         waitWhileAutoMode();
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
index 48dda5aa1f3..00a423b76c5 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 import de.uka.ilkd.key.logic.PosInOccurrence;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -16,10 +19,8 @@
 import de.uka.ilkd.key.prover.impl.ApplyStrategy;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
 import de.uka.ilkd.key.util.ProofStarter;
-import org.key_project.util.collection.ImmutableList;
 
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
+import org.key_project.util.collection.ImmutableList;
 
 /**
  * The default implementation of {@link ProofControl}.
@@ -45,12 +46,12 @@ public class DefaultProofControl extends AbstractProofControl {
     /**
      * Constructor.
      *
-     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *                                  to all started {@link ApplyStrategy} instances.
+     *        to all started {@link ApplyStrategy} instances.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-                               DefaultUserInterfaceControl defaultProverTaskListener) {
+            DefaultUserInterfaceControl defaultProverTaskListener) {
         super(defaultProverTaskListener);
         this.ui = ui;
     }
@@ -58,21 +59,21 @@ public DefaultProofControl(UserInterfaceControl ui,
     /**
      * Constructor.
      *
-     * @param ui                        The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
+     * @param ui The {@link UserInterfaceControl} in which this {@link ProofControl} is used.
      * @param defaultProverTaskListener The default {@link ProverTaskListener} which will be added
-     *                                  to all started {@link ApplyStrategy} instances.
-     * @param ruleCompletionHandler     An optional {@link RuleCompletionHandler}.
+     *        to all started {@link ApplyStrategy} instances.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      */
     public DefaultProofControl(UserInterfaceControl ui,
-                               DefaultUserInterfaceControl defaultProverTaskListener,
-                               RuleCompletionHandler ruleCompletionHandler) {
+            DefaultUserInterfaceControl defaultProverTaskListener,
+            RuleCompletionHandler ruleCompletionHandler) {
         super(defaultProverTaskListener, ruleCompletionHandler);
         this.ui = ui;
     }
 
     @Override
     public synchronized void startAutoMode(Proof proof, ImmutableList<Goal> goals,
-                                           ProverTaskListener ptl) {
+            ProverTaskListener ptl) {
         if (!isInAutoMode()) {
             autoModeThread = new AutoModeThread(proof, goals, ptl);
             autoModeThread.start();
@@ -121,7 +122,7 @@ public void run() {
                 fireAutoModeStarted(new ProofEvent(proof));
                 ProofStarter starter = ptl != null
                         ? new ProofStarter(
-                        new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
+                            new CompositePTListener(getDefaultProverTaskListener(), ptl), false)
                         : new ProofStarter(getDefaultProverTaskListener(), false);
                 starter.init(proof);
                 if (goals != null) {
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index dc2936d64e7..c791034caa9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -3,6 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
+import java.io.File;
+import java.util.*;
+import java.util.function.Consumer;
+
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.abstraction.KeYJavaType;
@@ -21,11 +25,8 @@
 import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.util.KeYTypeUtil;
 import de.uka.ilkd.key.util.Pair;
-import org.key_project.util.collection.ImmutableSet;
 
-import java.io.File;
-import java.util.*;
-import java.util.function.Consumer;
+import org.key_project.util.collection.ImmutableSet;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification
@@ -67,7 +68,7 @@ public class KeYEnvironment<U extends UserInterfaceControl> {
     /**
      * Constructor
      *
-     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig) {
@@ -77,11 +78,11 @@ public KeYEnvironment(U ui, InitConfig initConfig) {
     /**
      * Constructor
      *
-     * @param ui         The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
+     * @param ui The {@link UserInterfaceControl} in which the {@link Proof} is loaded.
      * @param initConfig The loaded project.
      */
     public KeYEnvironment(U ui, InitConfig initConfig, Proof loadedProof,
-                          Pair<String, Location> proofScript, ReplayResult replayResult) {
+            Pair<String, Location> proofScript, ReplayResult replayResult) {
         this.ui = ui;
         this.initConfig = initConfig;
         this.loadedProof = loadedProof;
@@ -180,15 +181,15 @@ public Proof createProof(ProofOblInput input) throws ProofInputException {
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location      The location to load.
-     * @param classPaths    The class path entries to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
      * @param bootClassPath The boot class path to use.
-     * @param includes      Optional includes to consider.
+     * @param includes Optional includes to consider.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes)
+            List<File> classPaths, File bootClassPath, List<File> includes)
             throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, false);
     }
@@ -197,103 +198,103 @@ public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param location              The location to load.
-     * @param classPaths            The class path entries to use.
-     * @param bootClassPath         The boot class path to use.
-     * @param includes              Optional includes to consider.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
      * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            RuleCompletionHandler ruleCompletionHandler) throws ProblemLoaderException {
         return load(null, location, classPaths, bootClassPath, includes, null,
-                ruleCompletionHandler, false);
+            ruleCompletionHandler, false);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as
-     *                                   {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
-     *                                   will be used for new proofs.
+     *        {@link Profile} of new proofs, {@code false} {@link Profile} specified by problem file
+     *        will be used for new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, null, null,
-                forceNewProfileOfNewProofs);
+            forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
-     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
+     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *                                   new proofs.
+     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *        new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         return load(profile, location, classPaths, bootClassPath, includes, poPropertiesToForce,
-                ruleCompletionHandler,
-                null, forceNewProfileOfNewProofs);
+            ruleCompletionHandler,
+            null, forceNewProfileOfNewProofs);
     }
 
     /**
      * Loads the given location and returns all required references as {@link KeYEnvironment}. The
      * {@code MainWindow} is not involved in the whole process.
      *
-     * @param profile                    The {@link Profile} to use.
-     * @param location                   The location to load.
-     * @param classPaths                 The class path entries to use.
-     * @param bootClassPath              The boot class path to use.
-     * @param includes                   Optional includes to consider.
-     * @param poPropertiesToForce        Some optional PO {@link Properties} to force.
-     * @param ruleCompletionHandler      An optional {@link RuleCompletionHandler}.
-     * @param callbackProofLoaded        An optional callback (called when the proof is loaded, before
-     *                                   replay)
+     * @param profile The {@link Profile} to use.
+     * @param location The location to load.
+     * @param classPaths The class path entries to use.
+     * @param bootClassPath The boot class path to use.
+     * @param includes Optional includes to consider.
+     * @param poPropertiesToForce Some optional PO {@link Properties} to force.
+     * @param ruleCompletionHandler An optional {@link RuleCompletionHandler}.
+     * @param callbackProofLoaded An optional callback (called when the proof is loaded, before
+     *        replay)
      * @param forceNewProfileOfNewProofs {@code} true
      *        {@code AbstractProblemLoader.profileOfNewProofs} will be used as {@link Profile} of
-     *                                   new proofs, {@code false} {@link Profile} specified by problem file will be used for
-     *                                   new proofs.
+     *        new proofs, {@code false} {@link Profile} specified by problem file will be used for
+     *        new proofs.
      * @return The {@link KeYEnvironment} which contains all references to the loaded location.
      * @throws ProblemLoaderException Occurred Exception
      */
     public static KeYEnvironment<DefaultUserInterfaceControl> load(Profile profile, File location,
-                                                                   List<File> classPaths, File bootClassPath, List<File> includes,
-                                                                   Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
-                                                                   Consumer<Proof> callbackProofLoaded,
-                                                                   boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
+            List<File> classPaths, File bootClassPath, List<File> includes,
+            Properties poPropertiesToForce, RuleCompletionHandler ruleCompletionHandler,
+            Consumer<Proof> callbackProofLoaded,
+            boolean forceNewProfileOfNewProofs) throws ProblemLoaderException {
         DefaultUserInterfaceControl ui = new DefaultUserInterfaceControl(ruleCompletionHandler);
         AbstractProblemLoader loader = ui.load(profile, location, classPaths, bootClassPath,
-                includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
+            includes, poPropertiesToForce, forceNewProfileOfNewProofs, callbackProofLoaded);
         InitConfig initConfig = loader.getInitConfig();
 
         return new KeYEnvironment<>(ui, initConfig, loader.getProof(),
-                loader.getProofScript(), loader.getResult());
+            loader.getProofScript(), loader.getResult());
     }
 
     public static KeYEnvironment<DefaultUserInterfaceControl> load(File keyFile)
@@ -335,9 +336,11 @@ public List<Contract> getAvailableContracts() {
         Set<KeYJavaType> kjts = getJavaInfo().getAllKeYJavaTypes();
         for (KeYJavaType type : kjts) {
             if (!KeYTypeUtil.isLibraryClass(type)) {
-                ImmutableSet<IObserverFunction> targets = getSpecificationRepository().getContractTargets(type);
+                ImmutableSet<IObserverFunction> targets =
+                    getSpecificationRepository().getContractTargets(type);
                 for (IObserverFunction target : targets) {
-                    ImmutableSet<Contract> contracts = getSpecificationRepository().getContracts(type, target);
+                    ImmutableSet<Contract> contracts =
+                        getSpecificationRepository().getContracts(type, target);
                     for (Contract contract : contracts) {
                         proofContracts.add(contract);
                     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index f30b7bb97d1..3b5971cbb72 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
@@ -123,7 +123,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode of.
      */
-    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals());}
+    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals()); }
 
     /**
      * Starts the auto mode for the given {@link Proof} and the given {@link Goal}s.
@@ -158,7 +158,8 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * @param proof The {@link Proof} to start auto mode and to wait for.
      * @param goals The {@link Goal}s to close.
      */
-    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) throws InterruptedException;
+    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
+            throws InterruptedException;
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
index 29b9579f640..476d4ef1cb9 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFacade.java
@@ -18,7 +18,8 @@ public class ProofMacroFacade {
     private static ProofMacroFacade INSTANCE;
 
     public static ProofMacroFacade instance() {
-        if (INSTANCE == null) INSTANCE = new ProofMacroFacade();
+        if (INSTANCE == null)
+            INSTANCE = new ProofMacroFacade();
         return INSTANCE;
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
index ebe8d366f00..962228f3ca8 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
index 44a26161832..8414e89e769 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/macros/scripts/ProofScriptCommandFacade.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.macros.scripts;
 
-import de.uka.ilkd.key.smt.IllegalNumberException;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -25,7 +24,8 @@ public ProofScriptCommandFacade() {
     }
 
     public static ProofScriptCommandFacade instance() {
-        if(INSTANCE == null) INSTANCE = new ProofScriptCommandFacade();
+        if (INSTANCE == null)
+            INSTANCE = new ProofScriptCommandFacade();
         return INSTANCE;
     }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
index 6198a8b88d9..67415ae80fd 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
@@ -774,7 +774,7 @@ public List<Rule> getAvailableRules() {
             if (just == null) {
                 continue; // do not break system because of this
             }
-            s.add(app.taclet()); //TODO not good
+            s.add(app.taclet()); // TODO not good
         }
         return s;
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
index 95ba46fe7be..9676dc91980 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Node.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.proof;
 
+import java.util.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -24,15 +25,13 @@
 import de.uka.ilkd.key.rule.RuleApp;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.util.Pair;
+
 import org.key_project.util.collection.DefaultImmutableSet;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.lookup.Lookup;
 
-import java.util.*;
-import java.util.stream.Stream;
-
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -128,7 +127,7 @@ public class Node implements Iterable<Node> {
      * taclet with an addrule section on this node, then these taclets are stored in this list
      */
     private ImmutableSet<NoPosTacletApp> localIntroducedRules =
-            DefaultImmutableSet.nil();
+        DefaultImmutableSet.nil();
 
     /**
      * Holds the undo methods for the information added by rules to the {@code Goal.strategyInfos}.
@@ -459,7 +458,7 @@ List<Node> getLeaves() {
 
     /**
      * @return an iterator for the leaves of the subtree below this node. The computation is called
-     * at every call!
+     *         at every call!
      */
     public Iterator<Node> leavesIterator() {
         return new NodeIterator(getLeaves().iterator());
@@ -504,7 +503,7 @@ public Node child(int i) {
     /**
      * @param child a child of this node.
      * @return the number of the node <code>child</code>, if it is a child of this node (starting
-     * with <code>0</code>), <code>-1</code> otherwise
+     *         with <code>0</code>), <code>-1</code> otherwise
      */
     public int getChildNr(Node child) {
         int res = 0;
@@ -544,16 +543,16 @@ public StringBuffer getUniqueTacletId() {
      * Helper for {@link #toString()}
      *
      * @param prefix needed to keep track if a line has to be printed
-     * @param tree   the tree representation we want to add this subtree " @param preEnumeration the
-     *               enumeration of the parent without the last number
+     * @param tree the tree representation we want to add this subtree " @param preEnumeration the
+     *        enumeration of the parent without the last number
      * @param postNr the last number of the parents enumeration
-     * @param maxNr  the number of nodes at this level
-     * @param ownNr  the place of this node at this level
+     * @param maxNr the number of nodes at this level
+     * @param ownNr the place of this node at this level
      * @return the string representation of this node.
      */
 
     private StringBuffer toString(String prefix, StringBuffer tree, String preEnumeration,
-                                  int postNr, int maxNr, int ownNr) {
+            int postNr, int maxNr, int ownNr) {
         Iterator<Node> childrenIt = childrenIterator();
         // Some constants
         String frontIndent = (maxNr > 1 ? " " : "");
@@ -604,7 +603,7 @@ private StringBuffer toString(String prefix, StringBuffer tree, String preEnumer
         while (childrenIt.hasNext()) {
             childId++;
             childrenIt.next().toString(prefix, tree, newEnumeration, newPostNr, children.size(),
-                    childId);
+                childId);
         }
 
         return tree;
@@ -661,7 +660,7 @@ public String name() {
      * this node.
      *
      * @return true iff the parent of this node has this node as child and this condition holds also
-     * for the own children.
+     *         for the own children.
      */
     public boolean sanityCheckDoubleLinks() {
         if (!root()) {
@@ -788,7 +787,7 @@ public Iterator<Node> iterator() {
      * Retrieves a user-defined data.
      *
      * @param service the class for which the data were registered
-     * @param <T>     any class
+     * @param <T> any class
      * @return null or the previous data
      * @see #register(Object, Class)
      */
@@ -806,7 +805,7 @@ public <T> T lookup(Class<T> service) {
     /**
      * Register a user-defined data in this node info.
      *
-     * @param obj     an object to be registered
+     * @param obj an object to be registered
      * @param service the key under it should be registered
      * @param <T>
      */
@@ -817,9 +816,9 @@ public <T> void register(T obj, Class<T> service) {
     /**
      * Remove a previous registered user-defined data.
      *
-     * @param obj     registered object
+     * @param obj registered object
      * @param service the key under which the data was registered
-     * @param <T>     arbitray object
+     * @param <T> arbitray object
      */
     public <T> void deregister(T obj, Class<T> service) {
         if (userData != null) {
diff --git a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
index 21f2fbc3674..04333491df3 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/speclang/njml/ContractLoadingTests.java
@@ -3,28 +3,31 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.speclang.njml;
 
+import java.io.File;
+import java.util.stream.Stream;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.init.ProofInputException;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.util.HelperClassForTests;
+
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.File;
-import java.util.stream.Stream;
-
 public class ContractLoadingTests {
     public static final File EXAMPLES_DIR = new File("../key.ui/examples/");
 
     static Stream<Arguments> files() {
         return Stream.of(
-                new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
-                new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java")
-        ).map(Arguments::of);
+            new File(EXAMPLES_DIR, "heap/vstte10_01_SumAndMax/src/SumAndMax.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1658/Test.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/java/Test.java"),
+            new File(HelperClassForTests.TESTCASE_DIRECTORY, "specMath/bigint/Test.java"))
+                .map(Arguments::of);
     }
 
     @ParameterizedTest
@@ -33,9 +36,11 @@ void issues1717() throws ProblemLoaderException, ProofInputException {
         File javaFile =
             new File(HelperClassForTests.TESTCASE_DIRECTORY, "issues/1717/UnderscoreZero.java");
         Assumptions.assumeTrue(javaFile.exists());
-        ProofManagementApi file = KeYApi.loadProof(javaFile);
-        Assertions.assertTrue(file.getProofContracts().size() > 0);
-        var proof = file.startProof(file.getProofContracts().get(0));
+
+        KeYEnvironment<?> env = KeYEnvironment.load(javaFile);
+        Assertions.assertFalse(env.getAvailableContracts().isEmpty());
+        var proof =
+            env.createProof(env.getAvailableContracts().get(0).createProofObl(env.getInitConfig()));
         Assertions.assertNotNull(proof);
     }
 
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
index 85a85b65df1..3d9c18f83f7 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
@@ -1,10 +1,8 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -14,9 +12,15 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using the
+ * This class wraps a {@link java.io.File} and has a special {@link #toString()} method only using
+ * the
  * short file name w/o path.
  * <p>
  * Used for displaying files in the examples list w/o prefix
@@ -139,12 +143,12 @@ public String toString() {
 
     public void addToTreeModel(DefaultTreeModel model) {
         DefaultMutableTreeNode node =
-                findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
+            findChild((DefaultMutableTreeNode) model.getRoot(), getPath(), 0);
         node.add(new DefaultMutableTreeNode(this));
     }
 
     private DefaultMutableTreeNode findChild(DefaultMutableTreeNode root, String[] path,
-                                             int from) {
+            int from) {
         if (from == path.length) {
             return root;
         }
@@ -166,7 +170,7 @@ public boolean hasProof() {
     }
 
     private static StringBuilder extractDescription(File file, StringBuilder sb,
-                                                    Properties properties) {
+            Properties properties) {
         try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
             String line;
             boolean emptyLineSeen = false;
@@ -193,4 +197,4 @@ private static StringBuilder extractDescription(File file, StringBuilder sb,
         }
         return sb;
     }
-}
\ No newline at end of file
+}
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
index a80815bbe03..24c539bf86f 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java
@@ -3,6 +3,12 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.swing.*;
+
 import de.uka.ilkd.key.control.InteractionListener;
 import de.uka.ilkd.key.core.InterruptListener;
 import de.uka.ilkd.key.core.KeYMediator;
@@ -16,15 +22,10 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
 /**
  * The Class ProofMacroWorker is a swing worker for the application of proof macros.
  * <p>
@@ -40,7 +41,7 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
      * goals under the current pio, selection remains where it was.
      */
     private static final boolean SELECT_GOAL_AFTER_MACRO =
-            Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
+        Boolean.parseBoolean(System.getProperty("key.macro.selectGoalAfter", "true"));
 
     /**
      * The {@link Node} to start macro at.
@@ -75,13 +76,13 @@ public class ProofMacroWorker extends SwingWorker<ProofMacroFinishedInfo, Void>
     /**
      * Instantiates a new proof macro worker.
      *
-     * @param node     the {@link Node} to start macro at.
-     * @param macro    the macro, not null
+     * @param node the {@link Node} to start macro at.
+     * @param macro the macro, not null
      * @param mediator the mediator, not null
      * @param posInOcc the position, possibly null
      */
     public ProofMacroWorker(Node node, ProofMacro macro, KeYMediator mediator,
-                            PosInOccurrence posInOcc) {
+            PosInOccurrence posInOcc) {
         assert macro != null;
         assert mediator != null;
         this.node = node;
@@ -98,7 +99,7 @@ protected ProofMacroFinishedInfo doInBackground() {
         Proof selectedProof = node.proof();
         info = ProofMacroFinishedInfo.getDefaultInfo(macro, selectedProof);
         ptl.taskStarted(
-                new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
+            new DefaultTaskStartedInfo(TaskStartedInfo.TaskKind.Macro, macro.getName(), 0));
         try {
             synchronized (macro) {
                 info = macro.applyTo(mediator.getUI(), node, posInOcc, ptl);
@@ -144,7 +145,7 @@ protected void done() {
     }
 
     protected void emitProofMacroFinished(Node node, ProofMacro macro, PosInOccurrence posInOcc,
-                                          ProofMacroFinishedInfo info) {
+            ProofMacroFinishedInfo info) {
         interactionListeners.forEach((l) -> l.runMacro(node, macro, posInOcc, info));
     }
 
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index 2b8a53215d5..d3bfa1a769e 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -24,16 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.awt.event.ActionEvent;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * This class provides an action for KeY UI which runs a set of specified proof files automatically.
  * The intent of this class is to have a massive test feature for the quality assurance of the KeY
@@ -83,7 +73,7 @@ public class RunAllProofsAction extends MainWindowAction {
     @NonNull
     private List<File> loadFiles() throws IOException {
         LOGGER.info("Use 'export {}=<...>' to set the input file for {}.", ENV_VARIABLE,
-                getClass().getSimpleName());
+            getClass().getSimpleName());
 
         InputStream stream;
         if (RUN_ALL_PROOFS_UI == null) {
@@ -97,7 +87,7 @@ private List<File> loadFiles() throws IOException {
         }
 
         try (BufferedReader in =
-                     new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+            new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             return in.lines().filter(it -> !it.startsWith("#") && !it.trim().isEmpty())
                     .map(it -> (it.startsWith("/") ? new File(it) : new File(exampleDir, it))
                             .getAbsoluteFile())
@@ -120,7 +110,7 @@ public RunAllProofsAction(MainWindow mainWindow) {
 
         setName("Run all proofs");
         setTooltip(
-                "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
+            "Open and run a pre-defined set of proofs for GUI testing. Enabled with KeY debug flag");
     }
 
     @Override
@@ -136,7 +126,7 @@ public void actionPerformed(ActionEvent e) {
                 ui.reportStatus(this, "Run: " + absFile);
                 LOGGER.info("Run: {}", absFile);
                 ProblemLoader problemLoader =
-                        ui.getProblemLoader(absFile, null, null, null, getMediator());
+                    ui.getProblemLoader(absFile, null, null, null, getMediator());
                 problemLoader.runSynchronously();
                 LOGGER.info("Loaded: {}", absFile);
 
diff --git a/keyext.api.doc/src/main/java/DocGen.java b/keyext.api.doc/src/main/java/DocGen.java
index 36aed393607..8ab51393898 100644
--- a/keyext.api.doc/src/main/java/DocGen.java
+++ b/keyext.api.doc/src/main/java/DocGen.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -47,9 +50,9 @@ private void printHeader() {
     }
 
     private void endpoints(Metamodel.Endpoint endpoint) {
-        //out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
-        //out.println(getJavaDoc(typeDeclaration));
-        //out.println("\n");
+        // out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
+        // out.println(getJavaDoc(typeDeclaration));
+        // out.println("\n");
 
         var direction = "";
         if (endpoint instanceof Metamodel.ServerRequest sr)
@@ -91,9 +94,9 @@ private void printType(Metamodel.Type type) {
                     }
                     ```
                     """.formatted(type.name(),
-                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
-                            .collect(Collectors.joining("\n"))));
+                ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                        .collect(Collectors.joining("\n"))));
         }
 
         if (type instanceof Metamodel.EnumType et) {
@@ -101,89 +104,87 @@ private void printType(Metamodel.Type type) {
                     ```
                     enum %s { %s }
                     ```
-                    """.formatted(type.name(), String.join(", ", et.values())
-            ));
+                    """.formatted(type.name(), String.join(", ", et.values())));
             out.format(type.documentation());
         }
         out.format(type.documentation());
         out.println();
     }
 
-        /*
-        private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
-            var annotationExpr = m.getAnnotationByName("JsonNotification").or(
-                            () -> m.getAnnotationByName("JsonRequest"))
-                    .orElseThrow();
-
-            var segment = getJsonSegment(td) + "/";
-            String name = "";
-
-            if (annotationExpr.isMarkerAnnotationExpr()) {
-                name = m.getNameAsString();
-            } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
-                var sma = annotationExpr.asSingleMemberAnnotationExpr();
-                name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
-            } else {
-                var ne = annotationExpr.asNormalAnnotationExpr();
-                for (MemberValuePair pair : ne.getPairs()) {
-                    switch (pair.getName().asString()) {
-                        case "value":
-                            name = pair.getValue().asLiteralStringValueExpr().getValue();
-                            break;
-                        case "useSegment":
-                            if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
-                                segment = "";
-                            }
-                    }
-                }
-            }
-            return segment + name;
-        }
-
-        @Nonnull
-        private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
-            if (typeDeclaration.getJavadoc().isPresent()) {
-                final var javadoc = typeDeclaration.getJavadoc().get();
-                return javadoc.getDescription().toText()
-                        + "\n\n"
-                        + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
-                        .collect(Collectors.joining("\n"));
-            }
-            return "";
-        }
-
-        private static String type (MethodDeclaration method){
-            if (method.getAnnotationByName("JsonNotification").isPresent())
-                return "notification";
-            if (method.getAnnotationByName("JsonRequest").isPresent())
-                return "request";
-            return "";
-        }
-
-        private static boolean isExported (MethodDeclaration method){
-            return method.getAnnotationByName("JsonNotification").isPresent()
-                    || method.getAnnotationByName("JsonRequest").isPresent();
-        }
-
-        private void printHeader () {
-            out.format("# KeY-API%n%n");
-        }
-
-        private void printFooter () {
-        }
-
-
     /*
-    private static boolean hasJsonSegment(TypeDeclaration<?> it) {
-        return it.getAnnotationByName("JsonSegment").isPresent();
-    }
-
-    private static String getJsonSegment(TypeDeclaration<?> it) {
-        var ae = it.getAnnotationByName("JsonSegment").get();
-        return ae.asSingleMemberAnnotationExpr().getMemberValue()
-                .asLiteralStringValueExpr().getValue();
-    }
+     * private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
+     * var annotationExpr = m.getAnnotationByName("JsonNotification").or(
+     * () -> m.getAnnotationByName("JsonRequest"))
+     * .orElseThrow();
+     *
+     * var segment = getJsonSegment(td) + "/";
+     * String name = "";
+     *
+     * if (annotationExpr.isMarkerAnnotationExpr()) {
+     * name = m.getNameAsString();
+     * } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
+     * var sma = annotationExpr.asSingleMemberAnnotationExpr();
+     * name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
+     * } else {
+     * var ne = annotationExpr.asNormalAnnotationExpr();
+     * for (MemberValuePair pair : ne.getPairs()) {
+     * switch (pair.getName().asString()) {
+     * case "value":
+     * name = pair.getValue().asLiteralStringValueExpr().getValue();
+     * break;
+     * case "useSegment":
+     * if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
+     * segment = "";
+     * }
+     * }
+     * }
+     * }
+     * return segment + name;
+     * }
+     *
+     * @Nonnull
+     * private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
+     * if (typeDeclaration.getJavadoc().isPresent()) {
+     * final var javadoc = typeDeclaration.getJavadoc().get();
+     * return javadoc.getDescription().toText()
+     * + "\n\n"
+     * + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
+     * .collect(Collectors.joining("\n"));
+     * }
+     * return "";
+     * }
+     *
+     * private static String type (MethodDeclaration method){
+     * if (method.getAnnotationByName("JsonNotification").isPresent())
+     * return "notification";
+     * if (method.getAnnotationByName("JsonRequest").isPresent())
+     * return "request";
+     * return "";
+     * }
+     *
+     * private static boolean isExported (MethodDeclaration method){
+     * return method.getAnnotationByName("JsonNotification").isPresent()
+     * || method.getAnnotationByName("JsonRequest").isPresent();
+     * }
+     *
+     * private void printHeader () {
+     * out.format("# KeY-API%n%n");
+     * }
+     *
+     * private void printFooter () {
+     * }
+     *
+     *
+     * /*
+     * private static boolean hasJsonSegment(TypeDeclaration<?> it) {
+     * return it.getAnnotationByName("JsonSegment").isPresent();
+     * }
+     *
+     * private static String getJsonSegment(TypeDeclaration<?> it) {
+     * var ae = it.getAnnotationByName("JsonSegment").get();
+     * return ae.asSingleMemberAnnotationExpr().getMemberValue()
+     * .asLiteralStringValueExpr().getValue();
+     * }
      */
 
 }
-
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index 1c6c904553e..d053b9268d3 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -1,10 +1,26 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import de.uka.ilkd.key.proof.Proof;
+
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
 import com.google.gson.*;
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
@@ -13,18 +29,6 @@
 import org.keyproject.key.api.remoteclient.ClientApi;
 import sun.misc.Unsafe;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
@@ -51,7 +55,8 @@ public static void main(String[] args) {
         runGenerator("server.py", PythionGenerator.PyApiGen::new);
     }
 
-    private static void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
+    private static void runGenerator(String target,
+            Function<Metamodel.KeyApi, Supplier<String>> api) {
         try {
             var n = api.apply(keyApi);
             Files.writeString(Paths.get(target), n.get());
@@ -65,7 +70,8 @@ private static Gson getGson() {
                 .setPrettyPrinting()
                 .registerTypeAdapter(Type.class, new JsonSerializer<Metamodel.Type>() {
                     @Override
-                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializationContext context) {
+                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc,
+                            JsonSerializationContext context) {
                         JsonObject json = (JsonObject) context.serialize(src);
                         json.addProperty("kind", src.kind());
                         return json;
@@ -76,7 +82,8 @@ public JsonElement serialize(Metamodel.Type src, Type typeOfSrc, JsonSerializati
 
     private static void addServerEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
-        if (jsonSegment == null) return;
+        if (jsonSegment == null)
+            return;
         var segment = jsonSegment.value();
 
         var req = method.getAnnotation(JsonRequest.class);
@@ -131,27 +138,41 @@ private static Metamodel.Type getOrFindType(Class<?> type) {
             return getOrFindType(type.getTypeParameters()[0].getClass());
         }
 
-        if (type == Unsafe.class || type == Class.class || type == Constructor.class || type == Proof.class) {
+        if (type == Unsafe.class || type == Class.class || type == Constructor.class
+                || type == Proof.class) {
             throw new IllegalStateException("Forbidden class reached!");
         }
 
-        if (type == String.class) return Metamodel.BuiltinType.STRING;
-        if (type == Integer.class) return Metamodel.BuiltinType.INT;
-        if (type == Double.class) return Metamodel.BuiltinType.DOUBLE;
-        if (type == Long.class) return Metamodel.BuiltinType.LONG;
-        if (type == Character.class) return Metamodel.BuiltinType.LONG;
-        if (type == File.class) return Metamodel.BuiltinType.STRING;
-        if (type == Boolean.class) return Metamodel.BuiltinType.BOOL;
-        if (type == Boolean.TYPE) return Metamodel.BuiltinType.BOOL;
-
-        if (type == Integer.TYPE) return Metamodel.BuiltinType.INT;
-        if (type == Double.TYPE) return Metamodel.BuiltinType.DOUBLE;
-        if (type == Long.TYPE) return Metamodel.BuiltinType.LONG;
-        if (type == Character.TYPE) return Metamodel.BuiltinType.LONG;
+        if (type == String.class)
+            return Metamodel.BuiltinType.STRING;
+        if (type == Integer.class)
+            return Metamodel.BuiltinType.INT;
+        if (type == Double.class)
+            return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.class)
+            return Metamodel.BuiltinType.LONG;
+        if (type == Character.class)
+            return Metamodel.BuiltinType.LONG;
+        if (type == File.class)
+            return Metamodel.BuiltinType.STRING;
+        if (type == Boolean.class)
+            return Metamodel.BuiltinType.BOOL;
+        if (type == Boolean.TYPE)
+            return Metamodel.BuiltinType.BOOL;
+
+        if (type == Integer.TYPE)
+            return Metamodel.BuiltinType.INT;
+        if (type == Double.TYPE)
+            return Metamodel.BuiltinType.DOUBLE;
+        if (type == Long.TYPE)
+            return Metamodel.BuiltinType.LONG;
+        if (type == Character.TYPE)
+            return Metamodel.BuiltinType.LONG;
 
         System.out.println(type);
         var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
-        if (t.isPresent()) return t.get();
+        if (t.isPresent())
+            return t.get();
         var a = createType(type);
         types.add(a);
         return a;
@@ -161,8 +182,8 @@ private static Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum())
             return new Metamodel.EnumType(type.getSimpleName(),
-                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
-                    documentation);
+                Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                documentation);
 
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
@@ -186,7 +207,8 @@ private static String findDocumentation(Class<?> type) {
                 e.printStackTrace();
                 return "";
             }
-        } else return "";
+        } else
+            return "";
     }
 
     private static Path findFileForType(Class<?> type) {
@@ -226,7 +248,8 @@ private static void addClientEndpoint(Method method) {
         }
     }
 
-    private static String callMethodName(String method, String segment, String userValue, boolean useSegment) {
+    private static String callMethodName(String method, String segment, String userValue,
+            boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -243,9 +266,11 @@ private static String callMethodName(String method, String segment, String userV
     }
 
     private static Metamodel.Type getOrFindType(Type genericReturnType) {
-        if (genericReturnType instanceof Class c) return getOrFindType(c);
+        if (genericReturnType instanceof Class c)
+            return getOrFindType(c);
         if (genericReturnType instanceof ParameterizedType pt) {
-            if (Objects.equals(pt.getRawType().getTypeName(), CompletableFuture.class.getTypeName())) {
+            if (Objects.equals(pt.getRawType().getTypeName(),
+                CompletableFuture.class.getTypeName())) {
                 return getOrFindType(pt.getActualTypeArguments()[0]);
             }
             if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index 1a868f49a06..62146f0f5ee 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -1,7 +1,10 @@
-import org.jspecify.annotations.NullMarked;
-
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.util.List;
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
@@ -10,11 +13,12 @@
 public class Metamodel {
     public record KeyApi(
             List<Endpoint> endpoints,
-            List<Type> types
-    ) {
+            List<Type> types) {
     }
 
-    sealed interface Endpoint {
+    sealed
+
+    interface Endpoint {
         String name();
 
         String documentation();
@@ -42,55 +46,67 @@ record ClientNotification(String name, String documentation, List<Argument> args
     }
 
     record Field(String name, /*Type*/ String type, String documentation) {
-        Field(String name, String type) {
+
+    Field(String name, String type) {
             this(name, type, "");
         }
-    }
+}
 
-    public sealed interface Type {
-        default String kind() {
+public sealed
+
+
+interface Type {
+    default String kind() {
             return getClass().getSimpleName();
         }
 
-        String documentation();
+    String documentation();
 
-        String name();
-    }
+    String name();
+}
 
-    enum BuiltinType implements Type {
-        INT, LONG, STRING, BOOL, DOUBLE;
 
-        @Override
-        public String documentation() {
-            return "built-in data type";
-        }
+enum BuiltinType implements Type {
+    INT, LONG, STRING, BOOL, DOUBLE;
+
+    @Override
+    public String documentation() {
+        return "built-in data type";
+    }
+
     }
 
     record ListType(Type type, String documentation) implements Type {
-        @Override
-        public String name() {
-            return type().name() + "[]";
-        }
+
+    @Override
+    public String name() {
+        return type().name() + "[]";
+    }
+
     }
 
     record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
-        @Override
-        public String name() {
-            return typeName;
-        }
+
+    @Override
+    public String name() {
+        return typeName;
+    }
+
     }
 
     public record EitherType(Type a, Type b, String documentation) implements Type {
-        @Override
-        public String name() {
-            return "either<a,b>";
-        }
+
+    @Override
+    public String name() {
+        return "either<a,b>";
+    }
+
     }
 
     public record EnumType(String typeName, List<String> values, String documentation) implements Type {
-        @Override
-        public String name() {
-            return typeName;
-        }
+
+    @Override
+    public String name() {
+        return typeName;
     }
-}
+}}
diff --git a/keyext.api.doc/src/main/java/PythionGenerator.java b/keyext.api.doc/src/main/java/PythionGenerator.java
index a4d2018c328..9fc222a1221 100644
--- a/keyext.api.doc/src/main/java/PythionGenerator.java
+++ b/keyext.api.doc/src/main/java/PythionGenerator.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -54,11 +57,11 @@ protected String asPython(Metamodel.Type t) {
 
         if (t instanceof Metamodel.BuiltinType bt) {
             return switch (bt) {
-                case INT -> "int";
-                case LONG -> "int";
-                case STRING -> "str";
-                case BOOL -> "bool";
-                case DOUBLE -> "float";
+            case INT -> "int";
+            case LONG -> "int";
+            case STRING -> "str";
+            case BOOL -> "bool";
+            case DOUBLE -> "float";
             };
         }
         return t.name();
@@ -85,19 +88,21 @@ protected void run() {
                     import enum
                     import abc
                     import typing
-                    from abc import abstractmethod                    
+                    from abc import abstractmethod
                     """);
             server(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ServerRequest || it instanceof Metamodel.ServerNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+                metamodel.endpoints()
+                        .stream()
+                        .filter(it -> it instanceof Metamodel.ServerRequest
+                                || it instanceof Metamodel.ServerNotification)
+                        .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
 
             client(
-                    metamodel.endpoints()
-                            .stream()
-                            .filter(it -> it instanceof Metamodel.ClientRequest || it instanceof Metamodel.ClientNotification)
-                            .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
+                metamodel.endpoints()
+                        .stream()
+                        .filter(it -> it instanceof Metamodel.ClientRequest
+                                || it instanceof Metamodel.ClientNotification)
+                        .sorted(Comparator.comparing(Metamodel.Endpoint::name)));
         }
 
 
@@ -113,7 +118,7 @@ private void clientEndpoint(Metamodel.Endpoint endpoint) {
             out.format("    @abstractmethod%n");
             if (endpoint instanceof Metamodel.ClientRequest sr) {
                 out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                        asPython(sr.returnType()));
+                    asPython(sr.returnType()));
             } else {
                 out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
             }
@@ -128,7 +133,7 @@ private void server(Stream<Metamodel.Endpoint> sorted) {
                     class KeyServer(ServerBase):%n
                         def __init__(self, endpoint : LspEndpoint):
                             super().__init__(endpoint)
-                              
+
                      """);
             sorted.forEach(this::serverEndpoint);
         }
@@ -147,13 +152,15 @@ private void serverEndpoint(Metamodel.Endpoint endpoint) {
 
             if (endpoint instanceof Metamodel.ServerRequest sr) {
                 out.format("    def %s(self, %s) -> %s:%n", endpoint.name().replace("/", "_"), args,
-                        asPython(sr.returnType()));
+                    asPython(sr.returnType()));
                 out.format("       \"\"\"%s\"\"\"%n%n", sr.documentation());
-                out.format("       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
+                out.format(
+                    "       return self._call_sync(\"%s\", %s)".formatted(endpoint.name(), params));
             } else {
                 out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
                 out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(), params));
+                out.format("        return self._call_async(\"%s\", %s)".formatted(endpoint.name(),
+                    params));
             }
             out.println();
             out.println();
@@ -183,12 +190,13 @@ protected void run() {
                     import abc
                     import typing
                     from abc import abstractmethod, ABCMeta
-                                                          
+
                     """);
             metamodel.types().forEach(this::printType);
 
-            var names = metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
-                    .collect(Collectors.joining(","));
+            var names =
+                metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
+                        .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
         }
 
@@ -200,10 +208,9 @@ private void printType(Metamodel.Type type) {
                         .formatted(it.name(), asPython(it.type()), it.documentation())));
 
                 out.format("\n    def __init__(self%s):%n".formatted(
-                        ot.fields().stream()
-                                .map(Metamodel.Field::name)
-                                .collect(Collectors.joining(", ", ", ", ""))
-                ));
+                    ot.fields().stream()
+                            .map(Metamodel.Field::name)
+                            .collect(Collectors.joining(", ", ", ", ""))));
 
                 if (ot.fields().isEmpty())
                     out.format("        pass%n%n");
@@ -220,4 +227,4 @@ private void printType(Metamodel.Type type) {
             out.println();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
index b8f61b62272..9082242ee37 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -1,13 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
-import com.google.gson.*;
-
 import java.lang.reflect.Type;
 
+import com.google.gson.*;
+
 /**
- * <a href="https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow post</a>
+ * <a href=
+ * "https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow
+ * post</a>
  */
-public class GenericSerializer implements JsonSerializer<Object> /*, JsonDeserializer<Object>*/ {
+public class GenericSerializer implements JsonSerializer<Object> /* , JsonDeserializer<Object> */ {
 
     private static final String CLASS_PROPERTY_NAME = "$type";
     private final Gson gson;
@@ -21,31 +26,31 @@ public GenericSerializer(Gson gson) {
     }
 
     /*
-    @Override
-    public Object deserialize(JsonElement json, Type typeOfT,
-                              JsonDeserializationContext context) throws JsonParseException {
-
-        Class<?> actualClass;
-        if (json.isJsonObject()) {
-            JsonObject jsonObject = json.getAsJsonObject();
-            String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
-            try {
-                actualClass = Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-                throw new JsonParseException(e.getMessage());
-            }
-        } else {
-            actualClass = typeOfT.getClass();
-        }
-
-        return gson.fromJson(json, actualClass);
-    }
+     * @Override
+     * public Object deserialize(JsonElement json, Type typeOfT,
+     * JsonDeserializationContext context) throws JsonParseException {
+     *
+     * Class<?> actualClass;
+     * if (json.isJsonObject()) {
+     * JsonObject jsonObject = json.getAsJsonObject();
+     * String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
+     * try {
+     * actualClass = Class.forName(className);
+     * } catch (ClassNotFoundException e) {
+     * e.printStackTrace();
+     * throw new JsonParseException(e.getMessage());
+     * }
+     * } else {
+     * actualClass = typeOfT.getClass();
+     * }
+     *
+     * return gson.fromJson(json, actualClass);
+     * }
      */
 
     @Override
     public JsonElement serialize(Object src, Type typeOfSrc,
-                                 JsonSerializationContext context) {
+            JsonSerializationContext context) {
         JsonElement retValue = gson.toJsonTree(src);
         if (retValue.isJsonObject()) {
             retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getName());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index f2a28731d3a..1e3a0539711 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -1,5 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
 import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
@@ -23,11 +36,13 @@
 import de.uka.ilkd.key.prover.TaskStartedInfo;
 import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.util.KeYConstants;
+
+import org.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSet;
+
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.key_project.util.collection.ImmutableList;
-import org.key_project.util.collection.ImmutableSet;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.internal.NodeText;
@@ -36,16 +51,6 @@
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
-
 public final class KeyApiImpl implements KeyApi {
     private final KeyIdentifications data = new KeyIdentifications();
 
@@ -74,8 +79,8 @@ public KeyApiImpl() {
     @Override
     @JsonRequest
     public CompletableFuture<List<ExampleDesc>> examples() {
-        return CompletableFutures.computeAsync((c) ->
-                ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+        return CompletableFutures
+                .computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples())
                         .stream().map(ExampleDesc::from).toList());
     }
 
@@ -101,19 +106,20 @@ public CompletableFuture<String> getVersion() {
     @Override
     public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                ProofMacroFacade.instance().getMacros().stream()
-                        .map(ProofMacroDesc::from).toList()
-        );
+            ProofMacroFacade.instance().getMacros().stream()
+                    .map(ProofMacroDesc::from).toList());
     }
 
     @Override
     public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                ProofScriptCommandFacade.instance().getScriptCommands().stream().map(ProofScriptCommandDesc::from).toList());
+            ProofScriptCommandFacade.instance().getScriptCommands().stream()
+                    .map(ProofScriptCommandDesc::from).toList());
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine, StreategyOptions options) {
+    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine,
+            StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
@@ -129,14 +135,16 @@ public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLi
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId, StreategyOptions options) {
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId,
+            StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
             var macro = Objects.requireNonNull(ProofMacroFacade.instance().getMacro(macroId));
 
             try {
-                var info = macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
+                var info =
+                    macro.applyTo(env.getUi(), proof, proof.openGoals(), null, clientListener);
                 return MacroStatistic.from(proofId, info);
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -152,8 +160,8 @@ public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions
             var env = data.find(proofId.env());
             try {
                 env.getProofControl().startAndWaitForAutoMode(proof);
-                //clientListener);
-                return null;//MacroStatistic.from(proofId, info);
+                // clientListener);
+                return null;// MacroStatistic.from(proofId, info);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -172,7 +180,8 @@ public CompletableFuture<Boolean> dispose(ProofId id) {
     }
 
     @Override
-    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened, boolean onlyEnabled) {
+    public CompletableFuture<List<NodeDesc>> goals(ProofId proofId, boolean onlyOpened,
+            boolean onlyEnabled) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             if (onlyOpened && !onlyEnabled) {
@@ -195,7 +204,7 @@ private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
 
     private NodeDesc asNodeDesc(ProofId proofId, Node it) {
         return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(),
-                it.getNodeInfo().getScriptRuleApplication());
+            it.getNodeInfo().getScriptRuleApplication());
     }
 
     @Override
@@ -207,12 +216,12 @@ public CompletableFuture<NodeDesc> tree(ProofId proofId) {
     }
 
     private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
-        final List<NodeDesc> list = root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
+        final List<NodeDesc> list =
+            root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
-                root.getNodeInfo().getBranchLabel(),
-                root.getNodeInfo().getScriptRuleApplication(),
-                list
-        );
+            root.getNodeInfo().getBranchLabel(),
+            root.getNodeInfo().getScriptRuleApplication(),
+            list);
     }
 
     @Override
@@ -282,7 +291,8 @@ public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(envId);
             var contracts = env.getAvailableContracts();
-            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it)).toList();
+            return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it))
+                    .toList();
         });
     }
 
@@ -291,7 +301,8 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(contractId.envId());
             var contracts = env.getAvailableContracts();
-            var contract = contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
+            var contract =
+                contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
             if (contract.isPresent()) {
                 try {
                     var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
@@ -311,7 +322,8 @@ public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options
             var node = data.find(nodeId);
             var env = data.find(nodeId.proofId().env());
             var notInfo = new NotationInfo();
-            final var layouter = new PosTableLayouter(options.width(), options.indentation(), options.pure());
+            final var layouter =
+                new PosTableLayouter(options.width(), options.indentation(), options.pure());
             var lp = new LogicPrinter(notInfo, env.getServices(), layouter);
             lp.printSequent(node.sequent());
 
@@ -332,8 +344,9 @@ public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int p
             var goal = proof.getOpenGoal(node);
             var nodeText = data.find(printId);
             var pis = nodeText.table().getPosInSequent(pos, filter);
-            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis, goal)
-                    .getActions();
+            return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis,
+                goal)
+                        .getActions();
         });
 
     }
@@ -365,19 +378,21 @@ public CompletableFuture<ProofId> loadExample(String id) {
                 KeYEnvironment<?> env = null;
                 try {
                     var loader = control.load(JavaProfile.getDefaultProfile(),
-                            ex.getObligationFile(), null, null, null, null, true, null);
+                        ex.getObligationFile(), null, null, null, null, true, null);
                     InitConfig initConfig = loader.getInitConfig();
 
                     env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                            loader.getProofScript(), loader.getResult());
+                        loader.getProofScript(), loader.getResult());
                     var envId = new EnvironmentId(env.toString());
                     data.register(envId, env);
                     proof = Objects.requireNonNull(env.getLoadedProof());
                     var proofId = new ProofId(envId, proof.name().toString());
                     return data.register(proofId, proof);
                 } catch (ProblemLoaderException e) {
-                    if (proof != null) proof.dispose();
-                    if (env != null) env.dispose();
+                    if (proof != null)
+                        proof.dispose();
+                    if (env != null)
+                        env.dispose();
                     throw new RuntimeException(e);
                 }
             }
@@ -390,17 +405,19 @@ public CompletableFuture<ProofId> loadProblem(ProblemDefinition problem) {
         return CompletableFutures.computeAsync((c) -> {
             Proof proof = null;
             KeYEnvironment<?> env = null;
-              /*  var loader = control.load(JavaProfile.getDefaultProfile(),
-                        ex.getObligationFile(), null, null, null, null, true, null);
-                InitConfig initConfig = loader.getInitConfig();
-
-                env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
-                var envId = new EnvironmentId(env.toString());
-                data.register(envId, env);
-                proof = Objects.requireNonNull(env.getLoadedProof());
-                var proofId = new ProofId(envId, proof.name().toString());
-                return data.register(proofId, proof);*/
+            /*
+             * var loader = control.load(JavaProfile.getDefaultProfile(),
+             * ex.getObligationFile(), null, null, null, null, true, null);
+             * InitConfig initConfig = loader.getInitConfig();
+             *
+             * env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
+             * loader.getProofScript(), loader.getResult());
+             * var envId = new EnvironmentId(env.toString());
+             * data.register(envId, env);
+             * proof = Objects.requireNonNull(env.getLoadedProof());
+             * var proofId = new ProofId(envId, proof.name().toString());
+             * return data.register(proofId, proof);
+             */
             return null;
         });
 
@@ -415,18 +432,20 @@ public CompletableFuture<ProofId> loadKey(String content) {
                 final var tempFile = File.createTempFile("json-rpc-", ".key");
                 Files.writeString(tempFile.toPath(), content);
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                        tempFile, null, null, null, null, true, null);
+                    tempFile, null, null, null, null, true, null);
                 InitConfig initConfig = loader.getInitConfig();
                 env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
+                    loader.getProofScript(), loader.getResult());
                 var envId = new EnvironmentId(env.toString());
                 data.register(envId, env);
                 proof = Objects.requireNonNull(env.getLoadedProof());
                 var proofId = new ProofId(envId, proof.name().toString());
                 return data.register(proofId, proof);
             } catch (ProblemLoaderException | IOException e) {
-                if (proof != null) proof.dispose();
-                if (env != null) env.dispose();
+                if (proof != null)
+                    proof.dispose();
+                if (env != null)
+                    env.dispose();
                 throw new RuntimeException(e);
             }
         });
@@ -444,16 +463,16 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
             KeYEnvironment<?> env = null;
             try {
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                        params.keyFile(),
-                        params.classPath(),
-                        params.bootClassPath(),
-                        params.includes(),
-                        null,
-                        true,
-                        null);
+                    params.keyFile(),
+                    params.classPath(),
+                    params.bootClassPath(),
+                    params.includes(),
+                    null,
+                    true,
+                    null);
                 InitConfig initConfig = loader.getInitConfig();
                 env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
-                        loader.getProofScript(), loader.getResult());
+                    loader.getProofScript(), loader.getResult());
                 var envId = new EnvironmentId(env.toString());
                 data.register(envId, env);
                 if ((proof = env.getLoadedProof()) != null) {
@@ -463,8 +482,10 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
                     return Either.forLeft(envId);
                 }
             } catch (ProblemLoaderException e) {
-                if (proof != null) proof.dispose();
-                if (env != null) env.dispose();
+                if (proof != null)
+                    proof.dispose();
+                if (env != null)
+                    env.dispose();
                 throw new RuntimeException(e);
             }
         });
@@ -502,7 +523,9 @@ public void loadingStarted(AbstractProblemLoader loader) {
         }
 
         @Override
-        public void loadingFinished(AbstractProblemLoader loader, IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList, AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
+        public void loadingFinished(AbstractProblemLoader loader,
+                IPersistablePO.LoadedPOContainer poContainer, ProofAggregate proofList,
+                AbstractProblemLoader.ReplayResult result) throws ProblemLoaderException {
             super.loadingFinished(loader, poContainer, proofList, result);
         }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
index f28001e8c15..2f948413e72 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -1,4 +1,4 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
-
-import org.keyproject.key.api.data.KeyIdentifications.NodeId;
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index b0491145cda..53293b35680 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -1,6 +1,16 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
 
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nullable;
+
 import com.google.gson.GsonBuilder;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
@@ -11,13 +21,6 @@
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
 
-import javax.annotation.Nullable;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutionException;
-
 /**
  * @author Alexander Weigl
  * @version 1 (07.10.23)
@@ -26,7 +29,7 @@
 public class StartServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StartServer.class);
 
-    //region CLI arguments
+    // region CLI arguments
     @Option(names = "--std", description = "use stdout and stdin for communication")
     boolean stdStreams;
     @Option(names = "--trace", description = "use stdout and stdin for communication")
@@ -41,19 +44,21 @@ public class StartServer implements Runnable {
     Integer clientPort;
 
 
-    @Option(names = "--infile", paramLabel = "FILE or PIPE", description = "read from named pipe or file")
+    @Option(names = "--infile", paramLabel = "FILE or PIPE",
+        description = "read from named pipe or file")
     @Nullable
     File inFile;
 
-    @Option(names = "--outfile", paramLabel = "FILE or PIPE", description = "write to named pipe or file")
+    @Option(names = "--outfile", paramLabel = "FILE or PIPE",
+        description = "write to named pipe or file")
     File outFile;
 
-    @Option(names = {"-h", "--help"}, usageHelp = true, description = "display a help message")
+    @Option(names = { "-h", "--help" }, usageHelp = true, description = "display a help message")
     boolean helpRequested = false;
 
     @Option(names = "--websocket")
     boolean websocket = false;
-    //endregion
+    // endregion
 
     public static void main(String[] args) {
         new CommandLine(new StartServer()).execute(args);
@@ -159,12 +164,11 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
-        //if (localServices != null && !localServices.isEmpty())
+        // if (localServices != null && !localServices.isEmpty())
         launcherBuilder.setLocalService(keyApi);
-        //if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
+        // if (remoteInterfaces != null && !remoteInterfaces.isEmpty())
         launcherBuilder.setRemoteInterface(ClientApi.class);
 
         return launcherBuilder.create();
     }
 }
-
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 31714a361d7..c65a93d677a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -1,5 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.control.ProofControl;
 import de.uka.ilkd.key.logic.Name;
@@ -9,56 +16,53 @@
 import de.uka.ilkd.key.pp.PosInSequent;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
-import org.jspecify.annotations.NonNull;
+
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
+
+import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
 import org.keyproject.key.api.data.TermActionDesc;
 import org.keyproject.key.api.data.TermActionKind;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
 public class TermActionUtil {
     private static final Set<Name> CLUTTER_RULESETS =
-            Set.of(new Name("notHumanReadable"),
-                    new Name("obsolete"),
-                    new Name("pullOutQuantifierAll"),
-                    new Name("pullOutQuantifierEx"));
+        Set.of(new Name("notHumanReadable"),
+            new Name("obsolete"),
+            new Name("pullOutQuantifierAll"),
+            new Name("pullOutQuantifierEx"));
     private static final Set<Name> CLUTTER_RULES = Set.of(
-            new Name("cut_direct_r"),
-            new Name("cut_direct_l"),
-            new Name("case_distinction_r"),
-            new Name("case_distinction_l"),
-            new Name("local_cut"),
-            new Name("commute_and_2"),
-            new Name("commute_or_2"),
-            new Name("boxToDiamond"),
-            new Name("pullOut"),
-            new Name("typeStatic"),
-            new Name("less_is_total"),
-            new Name("less_zero_is_total"),
-            new Name("applyEqReverse"),
+        new Name("cut_direct_r"),
+        new Name("cut_direct_l"),
+        new Name("case_distinction_r"),
+        new Name("case_distinction_l"),
+        new Name("local_cut"),
+        new Name("commute_and_2"),
+        new Name("commute_or_2"),
+        new Name("boxToDiamond"),
+        new Name("pullOut"),
+        new Name("typeStatic"),
+        new Name("less_is_total"),
+        new Name("less_zero_is_total"),
+        new Name("applyEqReverse"),
 
-            // the following are used for drag'n'drop interactions
-            new Name("eqTermCut"),
-            new Name("instAll"),
-            new Name("instEx")
-    );
+        // the following are used for drag'n'drop interactions
+        new Name("eqTermCut"),
+        new Name("instAll"),
+        new Name("instEx"));
     private static final Set<String> FILTER_SCRIPT_COMMANDS = Set.of(
-            "exit",
-            "leave",
-            "javascript",
-            "skip",
-            "macro",
-            "rule",
-            "script");
+        "exit",
+        "leave",
+        "javascript",
+        "skip",
+        "macro",
+        "rule",
+        "script");
 
     private final PosInSequent pos;
     private final Goal goal;
@@ -67,7 +71,8 @@ public class TermActionUtil {
     private final List<TermActionDesc> actions = new ArrayList<>(1024);
     private final NodeTextId nodeTextId;
 
-    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env, @NonNull PosInSequent pos, @NonNull Goal goal) {
+    public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?> env,
+            @NonNull PosInSequent pos, @NonNull Goal goal) {
         this.pos = pos;
         this.goal = goal;
         this.nodeTextId = nodeTextId;
@@ -75,8 +80,10 @@ public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?>
         ProofControl c = env.getUi().getProofControl();
         final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
         for (ProofMacro macro : ProofMacroFacade.instance().getMacros()) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "macro:" + macro.getScriptCommandName());
-            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(), macro.getCategory(), TermActionKind.Macro);
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "macro:" + macro.getScriptCommandName());
+            TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(),
+                macro.getCategory(), TermActionKind.Macro);
             add(ta);
         }
         ImmutableList<TacletApp> findTaclet = c.getFindTaclet(goal, occ);
@@ -86,16 +93,18 @@ public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?>
 
 
         for (TacletApp tacletApp : find) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "find:" + tacletApp.rule());
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "find:" + tacletApp.rule());
             TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
-                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+                tacletApp.rule().toString(), "", TermActionKind.Taclet);
             add(ta);
         }
 
         for (TacletApp tacletApp : nofind) {
-            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(), "nofind:" + tacletApp.rule());
+            var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
+                "nofind:" + tacletApp.rule());
             TermActionDesc ta = new TermActionDesc(id, tacletApp.rule().displayName(),
-                    tacletApp.rule().toString(), "", TermActionKind.Taclet);
+                tacletApp.rule().toString(), "", TermActionKind.Taclet);
             add(ta);
         }
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 67871cec674..53cd4cec09c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -1,49 +1,54 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.adapters;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import de.uka.ilkd.key.logic.op.Function;
+import de.uka.ilkd.key.macros.ProofMacro;
+
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import de.uka.ilkd.key.logic.op.Function;
-import de.uka.ilkd.key.macros.ProofMacro;
 import org.keyproject.key.api.data.MacroDescription;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Type;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
 public class KeyAdapter {
-    //private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
-    //private final TypeAdapter<Object> adaptor;
+    // private final BiMap<String, WeakReference<Object>> map = HashBiMap.create(1024);
+    // private final TypeAdapter<Object> adaptor;
 
     public KeyAdapter(GsonBuilder gson) {
         gson.registerTypeAdapter(File.class, new FileTypeAdapter());
-        //gson.registerTypeAdapter(Function.class, new FunctionSerializer());
-        //gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
+        // gson.registerTypeAdapter(Function.class, new FunctionSerializer());
+        // gson.registerTypeAdapter(ProofMacro.class, new MacroSerializer());
     }
 
 
     /*
-    //translating entities to identification strings
-    public void insert(Identifiable p) {
-        var id = p.identification();
-        if (!map.containsKey(id)) {
-            map.put(id, new WeakReference<>(p));
-        }
-    }
-
-    public Object find(String id) {
-        return map.get(id).get();
-    }
-    //endregion
-    */
+     * //translating entities to identification strings
+     * public void insert(Identifiable p) {
+     * var id = p.identification();
+     * if (!map.containsKey(id)) {
+     * map.put(id, new WeakReference<>(p));
+     * }
+     * }
+     *
+     * public Object find(String id) {
+     * return map.get(id).get();
+     * }
+     * //endregion
+     */
 
     static class MacroSerializer implements JsonSerializer<ProofMacro> {
         @Override
-        public JsonElement serialize(ProofMacro src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(ProofMacro src, Type typeOfSrc,
+                JsonSerializationContext context) {
             return context.serialize(MacroDescription.from(src));
         }
     }
@@ -62,7 +67,8 @@ public File read(JsonReader in) throws IOException {
 
     static class FunctionSerializer implements JsonSerializer<Function> {
         @Override
-        public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(Function src, Type typeOfSrc,
+                JsonSerializationContext context) {
             var obj = new JsonObject();
             obj.add("name", context.serialize(src.name().toString()));
             obj.add("skolemConstant", context.serialize(src.isSkolemConstant()));
@@ -76,7 +82,8 @@ public JsonElement serialize(Function src, Type typeOfSrc, JsonSerializationCont
 
     public static class ThrowableAdapter implements JsonSerializer<Throwable> {
         @Override
-        public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationContext context) {
+        public JsonElement serialize(Throwable src, Type typeOfSrc,
+                JsonSerializationContext context) {
             var obj = new JsonObject();
             obj.add("$class", context.serialize(src.getClass().getSimpleName()));
             obj.add("message", context.serialize(src.getMessage()));
@@ -85,16 +92,22 @@ public JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationCon
         }
     }
 
-    /*class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>, JsonDeserializer<Identifiable> {
-        @Override
-        public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return (Identifiable) find(json.getAsString());
-        }
-
-        @Override
-        public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext context) {
-            insert(src);
-            return context.serialize(src.identification());
-        }
-    }*/
+    /*
+     * class IdentifiableTypeAdapter implements JsonSerializer<Identifiable>,
+     * JsonDeserializer<Identifiable> {
+     *
+     * @Override
+     * public Identifiable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext
+     * context) throws JsonParseException {
+     * return (Identifiable) find(json.getAsString());
+     * }
+     *
+     * @Override
+     * public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext
+     * context) {
+     * insert(src);
+     * return context.serialize(src.identification());
+     * }
+     * }
+     */
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
index bbc28eec1ec..522f32d9b3b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/package-info.java
@@ -4,4 +4,4 @@
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
-package org.keyproject.key.api.adapters;
\ No newline at end of file
+package org.keyproject.key.api.adapters;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index 531bc2fb56d..b6a363a6f6e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.java.Services;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 1868871c0e3..3b7238f676e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import de.uka.ilkd.key.logic.op.Function;
-
 import java.util.List;
 
+import de.uka.ilkd.key.logic.op.Function;
+
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 6d66823142a..3f512c76fbd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -1,16 +1,20 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.internal.NodeText;
 
-import java.lang.ref.WeakReference;
-import java.util.Objects;
-
 /**
  * @author Alexander Weigl
  * @version 1 (29.10.23)
@@ -19,27 +23,31 @@ public class KeyIdentifications {
     private final BiMap<EnvironmentId, KeyEnvironmentContainer> mapEnv = HashBiMap.create(16);
 
     public KeyEnvironmentContainer getContainer(EnvironmentId environmentId) {
-        return Objects.requireNonNull(mapEnv.get(environmentId), "Could not find environment for id" + environmentId);
+        return Objects.requireNonNull(mapEnv.get(environmentId),
+            "Could not find environment for id" + environmentId);
     }
 
     public ProofContainer getContainer(ProofId proofId) {
         return Objects.requireNonNull(getContainer(proofId.env()).mapProof.get(proofId),
-                "Could not find proof for id" + proofId);
+            "Could not find proof for id" + proofId);
     }
 
     public KeYEnvironment<?> find(EnvironmentId envid) {
-        return Objects.requireNonNull(getContainer(envid).env.get(), "Environment was removed by gc");
+        return Objects.requireNonNull(getContainer(envid).env.get(),
+            "Environment was removed by gc");
     }
 
     @NonNull
     public Proof find(ProofId proofId) {
-        return Objects.requireNonNull(getContainer(proofId).wProof.get(), "Could not find a proof for id " + proofId);
+        return Objects.requireNonNull(getContainer(proofId).wProof.get(),
+            "Could not find a proof for id " + proofId);
     }
 
     @NonNull
     public NodeText find(NodeTextId nodeTextId) {
-        return Objects.requireNonNull(getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
-                "Could not find a print-out with the id " + nodeTextId);
+        return Objects.requireNonNull(
+            getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
+            "Could not find a print-out with the id " + nodeTextId);
     }
 
     public void dispose(NodeTextId nodeTextId) {
@@ -54,7 +62,8 @@ public void dispose(ProofId id) {
     }
 
     public Node find(NodeId nodeId) {
-        @NonNull Proof p = find(nodeId.proofId);
+        @NonNull
+        Proof p = find(nodeId.proofId);
         var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
         return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 85ec900cd57..6d0a47c9a3f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import java.io.File;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index 0274bc38b30..fc2a8ba0e95 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index b0c2397d1f3..6825f99a90c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -6,10 +9,9 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, boolean cancelled, int appliedRules,
+public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, int appliedRules,
                              int closedGoals) {
     public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
-        return new MacroStatistic(proofId, info.getMacro().getName(), info.isCancelled(),
-                info.getAppliedRules(), info.getClosedGoals());
+        return new MacroStatistic(proofId, info.getMacro().getName(), info.getAppliedRules(), info.getClosedGoals());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index eda5e693f64..cd306e53816 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
index 333b24f1c73..df4eb11f82f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
index 640c25371d6..dbb0e899496 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index d952ea3a654..be69d976fc7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -1,10 +1,13 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
index 31981c61beb..f1faea9cf12 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.ProofMacro;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index f6eef733d08..0f086d8f936 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index 66df02ee6b0..797f8ccb16f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -1,9 +1,12 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import de.uka.ilkd.key.logic.sort.Sort;
-
 import java.util.List;
 
+import de.uka.ilkd.key.logic.sort.Sort;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
index b73ee35b7b5..ea804f0562b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
index b27ac08a279..d9c619f4dea 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
index cc7d9aec71a..0a371aa48e4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index 7f8c9564aa9..99a258f79d4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 public enum TraceValue {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index 213bb6b9dbe..7f8509df70c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
index 5750fea944d..84898829e9a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
@@ -1,8 +1,9 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.internal;
 
 import de.uka.ilkd.key.pp.InitialPositionTable;
-import de.uka.ilkd.key.pp.PositionTable;
-import de.uka.ilkd.key.proof.Node;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index e84a0152760..dc8fb6362c6 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -1,5 +1,11 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.ContractDesc;
@@ -7,9 +13,6 @@
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.SortDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index 6c52dfd39aa..5f19f881e9d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -1,12 +1,14 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.gui.Example;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
 @JsonSegment("examples")
 public interface ExampleApi {
     @JsonRequest("list")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
index c0091943899..e2f00758a72 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 import de.uka.ilkd.key.gui.Example;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index 959ed91570c..68a9e263708 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.NodeTextDesc;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.data.NodeTextDesc;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index 56a166f9af7..a94b35967af 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -1,7 +1,11 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 /**
  * The combined interface that is provided by KeY.
  */
-public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi, GoalApi, EnvApi, ProofLoadApi{
+public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi,
+        GoalApi, EnvApi, ProofLoadApi {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index f101a47f16a..ea2c8174a58 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.ProofMacroDesc;
 import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import org.keyproject.key.api.data.KeyIdentifications.*;
-
 @JsonSegment("meta")
 public interface MetaApi {
     @JsonRequest("version")
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
index 6555b2a16fb..4144c9e6877 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
 /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index e496b7a4d38..8d0fc27154d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -1,25 +1,31 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import de.uka.ilkd.key.proof.Statistics;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
 import org.keyproject.key.api.data.StreategyOptions;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 public interface ProofApi {
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine, StreategyOptions options);
+    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
+            StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId, StreategyOptions options);
+    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId,
+            StreategyOptions options);
 
     @JsonRequest
     CompletableFuture<MacroStatistic> auto(ProofId proof, StreategyOptions options);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 9ffedadf57d..2b5f5e78187 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -1,19 +1,20 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
-import de.uka.ilkd.key.control.KeYEnvironment;
-import de.uka.ilkd.key.proof.Proof;
+import java.util.concurrent.CompletableFuture;
+
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.EnvironmentId;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
 import org.keyproject.key.api.data.LoadParams;
 import org.keyproject.key.api.data.ProblemDefinition;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * Functionalities for loading proofs either from a built-in example, or from a set of files.
  *
@@ -24,6 +25,7 @@
 public interface ProofLoadApi {
     /**
      * I am not sure whether this is helpful. Mainly a feature for testing?!
+     *
      * @param id
      * @return
      */
@@ -53,5 +55,6 @@ public interface ProofLoadApi {
      * @throws ProblemLoaderException if something went wrong
      */
     @JsonRequest
-    CompletableFuture<Either<EnvironmentId,ProofId>> load(LoadParams params) throws ProblemLoaderException;
-}
\ No newline at end of file
+    CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
+            throws ProblemLoaderException;
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index d3225919d63..cd4aa88b146 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -1,14 +1,17 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
 import org.keyproject.key.api.data.KeyIdentifications.TreeNodeId;
 import org.keyproject.key.api.data.TreeNodeDesc;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index 00e85b9e021..bcbff9a04ff 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -1,12 +1,15 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteapi;
 
+import java.util.concurrent.CompletableFuture;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.TraceValue;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
@@ -15,9 +18,15 @@
 public interface ServerManagement {
     /**
      * Shutdown Request (:leftwards_arrow_with_hook:)
-     * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that asks the server to exit. Clients must not send any notifications other than exit or requests to a server to which they have sent a shutdown request. Clients should also wait with sending the exit notification until they have received a response from the shutdown request.
+     * The shutdown request is sent from the client to the server. It asks the server to shut down,
+     * but to not exit (otherwise the response might not be delivered correctly to the client).
+     * There is a separate exit notification that asks the server to exit. Clients must not send any
+     * notifications other than exit or requests to a server to which they have sent a shutdown
+     * request. Clients should also wait with sending the exit notification until they have received
+     * a response from the shutdown request.
      * <p>
-     * If a server receives requests after a shutdown request those requests should error with InvalidRequest.
+     * If a server receives requests after a shutdown request those requests should error with
+     * InvalidRequest.
      * <p>
      * Request:
      * <p>
@@ -33,7 +42,8 @@ public interface ServerManagement {
 
     /**
      * Exit Notification (:arrow_right:)
-     * A notification to ask the server to exit its process. The server should exit with success code 0 if the shutdown request has been received before; otherwise with error code 1.
+     * A notification to ask the server to exit its process. The server should exit with success
+     * code 0 if the shutdown request has been received before; otherwise with error code 1.
      * <p>
      * Notification:
      * <p>
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index ca086eae72f..fe34e79927e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -1,14 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
+
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
+
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
-
 @JsonSegment("client")
 public interface ClientApi {
     @JsonNotification
@@ -16,9 +20,13 @@ public interface ClientApi {
 
     /**
      * LogTrace Notification (:arrow_left:)
-     * A notification to log the trace of the server’s execution. The amount and content of these notifications depends on the current trace configuration. If trace is 'off', the server should not send any logTrace notification. If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
+     * A notification to log the trace of the server’s execution. The amount and content of these
+     * notifications depends on the current trace configuration. If trace is 'off', the server
+     * should not send any logTrace notification. If trace is 'messages', the server should not add
+     * the 'verbose' field in the LogTraceParams.
      * <p>
-     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the server should send window/logMessage notifications.
+     * $/logTrace should be used for systematic trace reporting. For single debugging messages, the
+     * server should send window/logMessage notifications.
      * <p>
      * Notification:
      * <p>
@@ -27,11 +35,12 @@ public interface ClientApi {
      */
     @JsonNotification
     void logTrace(LogTraceParams params);
-    //region Window
+    // region Window
 
     /**
      * ShowMessage Notification (:arrow_left:)
-     * The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface.
+     * The show message notification is sent from a server to a client to ask the client to display
+     * a particular message in the user interface.
      * <p>
      * Notification:
      * <p>
@@ -45,7 +54,9 @@ public interface ClientApi {
 
     /**
      * ShowMessage Request (:arrow_right_hook:)
-     * The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+     * The show message request is sent from a server to a client to ask the client to display a
+     * particular message in the user interface. In addition to the show message notification the
+     * request allows to pass actions and to wait for an answer from the client.
      */
     @JsonRequest
     @Nullable
@@ -56,7 +67,8 @@ public interface ClientApi {
      * Show Document Request (:arrow_right_hook:)
      * New in version 3.16.0
      * <p>
-     * The show document request is sent from a server to a client to ask the client to display a particular resource referenced by a URI in the user interface.
+     * The show document request is sent from a server to a client to ask the client to display a
+     * particular resource referenced by a URI in the user interface.
      * <p>
      * property path (optional): window.showDocument
      * property type: ShowDocumentClientCapabilities defined as follows:
@@ -66,7 +78,9 @@ public interface ClientApi {
 
 
     void taskFinished(TaskFinishedInfo info);
+
     void taskProgress(int position);
+
     void taskStarted(TaskStartedInfo info);
-    //endregion
+    // endregion
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
index 7ae00a584e7..d1ae6245f0d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 record LogMessageParams(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
index b5995ff5220..9328544be6c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
index df586cac66d..79e94cc39bb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record MessageActionItem(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
index cb8c20dd311..8564f136f36 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
@@ -1,28 +1,31 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public enum MessageType {
-        Unused,
-        /**
-         * An error message.
-         */
-        Error,
-        /**
-         * A warning message.
-         */
-        Warning,
-        /**
-         * An information message.
-         */
-        Info,
-        /**
-         * A log message.
-         */
-        Log,
-        /**
-         * A debug message.
-         *
-         * @proposed
-         * @since 3.18.0
-         */
-        Debug
-    }
+    Unused,
+    /**
+     * An error message.
+     */
+    Error,
+    /**
+     * A warning message.
+     */
+    Warning,
+    /**
+     * An information message.
+     */
+    Info,
+    /**
+     * A log message.
+     */
+    Log,
+    /**
+     * A debug message.
+     *
+     * @proposed
+     * @since 3.18.0
+     */
+    Debug
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index 17502b1a910..1e3050bbfde 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import de.uka.ilkd.key.pp.Range;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
index b91a100858a..bb455cbebd5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record ShowDocumentResult(
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
index 9bf22a6f552..5b0a6fc0286 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 public record ShowMessageParams(
@@ -10,5 +13,5 @@ public record ShowMessageParams(
          * The actual message.
          */
         String message) {
-    
+
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 49e662c6524..6dcc7164acc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
 import java.util.List;
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index b275265b6c7..5f2335e5ef3 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -1,11 +1,15 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
+
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
-import org.keyproject.key.api.remoteclient.*;
 
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
+import org.keyproject.key.api.remoteclient.*;
 
 class SimpleClient implements ClientApi {
 
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
index 5e0c87e06f5..9e7869bdfaa 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/TestRpc.java
@@ -1,13 +1,8 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.remoteclient.ClientApi;
-
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
@@ -18,6 +13,14 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
+
 public class TestRpc {
     private Future<Void> clientListening, serverListening;
     private KeyApi keyApi;
diff --git a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
index 5d7647eaf34..5c02f2ba138 100644
--- a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
+++ b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.exploration;
 
+import java.io.File;
+
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.logic.*;
 import de.uka.ilkd.key.nparser.KeyIO;
@@ -10,13 +12,13 @@
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+
+import org.key_project.util.collection.ImmutableList;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.key_project.util.collection.ImmutableList;
-
-import java.io.File;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -83,7 +85,7 @@ public void testAdditionAntec() {
 
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-                "Parent is marked as ExplorationNode and data contains Exploration Action");
+            "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -125,7 +127,7 @@ public void testAdditionSucc() {
         testAddition(withAddedTerm, justification, added, false);
 
         assertTrue(checkNodeForExplorationDataAndAction(withAddedTerm.node().parent()),
-                "Parent is marked as ExplorationNode and data contains Exploration Action");
+            "Parent is marked as ExplorationNode and data contains Exploration Action");
 
         assertFalse(checkNodeForExplorationDataAndAction(withAddedTerm.node()));
         assertFalse(checkNodeForExplorationDataAndAction(justification.node()));
@@ -146,9 +148,9 @@ public void testChangeFormula() {
         assertSame(1, goals.size(), "Prerequisite for test");
         Sequent sequent = goals.head().node().sequent();
         PosInOccurrence pio =
-                new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
+            new PosInOccurrence(sequent.succedent().get(0), PosInTerm.getTopLevel(), false);
         expService.applyChangeFormula(goals.head(), pio, sequent.succedent().get(0).formula(),
-                change);
+            change);
         ImmutableList<Goal> newCreatedGoals = currentProof.openGoals();
 
         assertEquals(2, newCreatedGoals.size(), "Two new goals created");
@@ -166,7 +168,7 @@ public void testChangeFormula() {
         assertNotNull(justificationBranch.node().lookup(ExplorationNodeData.class));
 
         assertEquals(new Name("hide_right"), hideNode.getAppliedRuleApp().rule().name(),
-                "Hide Right was applied");
+            "Hide Right was applied");
         // set all goals to interactive
         justificationBranch.setEnabled(true);
         // perform proof, it has to close
@@ -184,34 +186,34 @@ public void testChangeFormula() {
      */
     private void testAddition(Goal withAddedTerm, Goal justification, Term added, boolean antec) {
         Semisequent semiSeqAdded =
-                antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+            antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
         Semisequent parentSemiSeqOfAdded =
-                antec ? withAddedTerm.node().parent().sequent().antecedent()
-                        : withAddedTerm.node().parent().sequent().succedent();
+            antec ? withAddedTerm.node().parent().sequent().antecedent()
+                    : withAddedTerm.node().parent().sequent().succedent();
 
         Semisequent semiSeqUntouched =
-                !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
+            !antec ? withAddedTerm.sequent().antecedent() : withAddedTerm.sequent().succedent();
 
         Semisequent parentSemiSeqOfUntouched =
-                !antec ? withAddedTerm.node().parent().sequent().antecedent()
-                        : withAddedTerm.node().parent().sequent().succedent();
+            !antec ? withAddedTerm.node().parent().sequent().antecedent()
+                    : withAddedTerm.node().parent().sequent().succedent();
 
 
         assertSame(semiSeqAdded.size(), parentSemiSeqOfAdded.size() + 1,
-                "The size of the added semisequent has changed");
+            "The size of the added semisequent has changed");
         assertEquals(semiSeqAdded.get(0).formula(), added, "Added Term is indeed added");
         assertFalse(justification.isAutomatic(), "Justification branch is marked as interactive");
 
         assertSame(semiSeqUntouched.size(), parentSemiSeqOfUntouched.size(),
-                "The size if untouched semisequents is the same");
+            "The size if untouched semisequents is the same");
         assertEquals(semiSeqUntouched, parentSemiSeqOfUntouched,
-                "The  untouched semisequents are equal");
+            "The  untouched semisequents are equal");
 
         Node parent = withAddedTerm.node().parent();
 
         assertEquals(parent, justification.node().parent(), "Both nodes have the same parent");
         assertEquals(new Name("cut"), parent.getAppliedRuleApp().rule().name(),
-                "The addition was inserted using the cut rule");
+            "The addition was inserted using the cut rule");
     }
 
     /**
diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
index 087e4c5d59f..045e315d72c 100644
--- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
+++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
@@ -35,9 +35,12 @@ public void actionPerformed(ActionEvent e) {
             // This method delegates the request only to the UserInterfaceControl
             // which implements the functionality. No functionality is allowed in this method body!
             new Thread(() -> {
-                MainWindow.getInstance().getMediator().getUI().getProofControl()
-                        .stopAndWaitAutoMode();
-                ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
+                try {
+                    MainWindow.getInstance().getMediator().getUI().getProofControl()
+                            .stopAndWaitAutoMode();
+                    ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
+                } catch (InterruptedException ignore) {
+                }
             }).start();
         }
     };

From 82ef399b7356017644cf211e9851308cc06ea439 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <wadoon@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:07:00 +0200
Subject: [PATCH 19/50] reenable sonarqube, disable the crappy things

* also fix some encoding in recorder/src files
---
 .github/old_workflows/sonarqube.yml           | 39 --------
 .github/workflows/artiweb.yml                 | 88 ------------------
 .github/workflows/code_quality.yml            | 89 +------------------
 .github/workflows/codeql.yml                  | 43 ---------
 .github/workflows/sonarqube.yml               | 49 ++++++++++
 build.gradle                                  | 11 +++
 gradle.properties                             |  1 +
 .../recoder/abstraction/IntersectionType.java |  2 +-
 .../java5to4/EnhancedFor2For.java             |  2 +-
 9 files changed, 64 insertions(+), 260 deletions(-)
 delete mode 100644 .github/old_workflows/sonarqube.yml
 delete mode 100644 .github/workflows/artiweb.yml
 delete mode 100644 .github/workflows/codeql.yml
 create mode 100644 .github/workflows/sonarqube.yml
 create mode 100644 gradle.properties

diff --git a/.github/old_workflows/sonarqube.yml b/.github/old_workflows/sonarqube.yml
deleted file mode 100644
index ac751f0d5a8..00000000000
--- a/.github/old_workflows/sonarqube.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This workflow helps you trigger a SonarCloud analysis of your code and populates
-# GitHub Code Scanning alerts with the vulnerabilities found.
-name: SonarCloud analysis
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  workflow_dispatch:
-
-permissions:
-  pull-requests: read # allows SonarCloud to decorate PRs with analysis results
-
-jobs:
-  Analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Analyze with SonarCloud
-        # You can pin the exact commit or the version.
-        # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049
-        uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret)
-        with:
-          args:
-            # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu)
-            # mandatory
-            -Dsonar.projectKey=key-main
-            -Dsonar.organization=keyproject
-            # Comma-separated paths to directories containing main source files.
-            #-Dsonar.sources= # optional, default is project base directory
-            # When you need the analysis to take place in a directory other than the one from which it was launched
-            #-Dsonar.projectBaseDir= # optional, default is .
-            # Comma-separated paths to directories containing test source files.
-            #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/
-            # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing.
-            #-Dsonar.verbose= # optional, default is false
diff --git a/.github/workflows/artiweb.yml b/.github/workflows/artiweb.yml
deleted file mode 100644
index ca963363cf0..00000000000
--- a/.github/workflows/artiweb.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Artiweb Comment
-
-on:
-  workflow_run:
-    workflows: [Tests]
-    types:
-      - completed
-
-# taken from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Download artifact'
-        id: da
-        uses: actions/github-script@v7
-        with:
-          script: |
-            if (context.payload.workflow_run === undefined) {
-                core.setFailed("No workflow run found");
-            }
-            const allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            
-            const testArtifact = allArtifacts.data.artifacts.find((artifact) => {
-               return artifact.name == "test-results"
-            });
-            if (testArtifact !== undefined) {
-               core.info("Found test-results artifact id: " + testArtifact.id);
-               core.setOutput("test-artifact-id", testArtifact.id);
-            } else {
-               core.info("Artifact test-results was not found");
-            }
-            
-            const numberArtifact = allArtifacts.data.artifacts.find((artifact) => {
-               return artifact.name == "pr-number"
-            });
-            if (numberArtifact !== undefined) {
-               core.info("Found pr-number artifact id: " + numberArtifact.id); 
-               let download = await github.rest.actions.downloadArtifact({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  artifact_id: numberArtifact.id,
-                  archive_format: 'zip',
-               });
-               let fs = require('fs');
-               fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
-            } else {
-               core.setFailed("Artifact pr-number was not found");
-            }
-
-      - name: 'Unzip artifact'
-        run: unzip pr_number.zip
-
-      - name: 'Read pr number'
-        id: rpn
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            let fs = require('fs');
-            let issue_number_text = fs.readFileSync('./pr_number', 'utf8');
-            core.info("Found pr number \"" + issue_number_text + "\"");
-            core.setOutput("pr-number", issue_number_text === "" ? "" : Number(issue_number_text));
-      - name: Find Comment
-        if: ${{ steps.rpn.outputs.pr-number != '' }}
-        uses: peter-evans/find-comment@v3
-        id: fc
-        with:
-          issue-number: ${{ steps.rpn.outputs.pr-number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Artiweb
-
-      - name: Create or update comment
-        if: ${{ steps.rpn.outputs.pr-number != '' }}
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ steps.rpn.outputs.pr-number }}
-          body: |
-            Thank you for your contribution.
-            
-            The test artifacts are available on [Artiweb](e8e3f762-a110-4e21-bc41-cacb5f3a3a50.ka.bw-cloud-instance.org/${{steps.rpn.outputs.pr-number}}/).
-            The newest artifact is [here](e8e3f762-a110-4e21-bc41-cacb5f3a3a50.ka.bw-cloud-instance.org/${{steps.rpn.outputs.pr-number}}/${{steps.da.outputs.test-artifact-id}}/).
-          edit-mode: replace
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 5410a014e96..1365c36e398 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -24,21 +24,6 @@ jobs:
         with:
           arguments: -DENABLE_NULLNESS=true compileTest
 
-
-  qodana:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2024.1.5
-
-      - uses: github/codeql-action/upload-sarif@v3
-        if: success() || failure()
-        with:
-          sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
-
   formatting:
     runs-on: ubuntu-latest
     steps:
@@ -51,76 +36,4 @@ jobs:
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v3.3.2
         with:
-          arguments: --continue spotlessCheck
-
-  # checkstyle:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         fetch-depth: 0
-  #     - run: scripts/tools/checkstyle/runIncrementalCheckstyle.sh --xml | tee report.xml
-  #     - run: |
-  #         npx violations-command-line -sarif sarif-report.json \
-  #         -v "CHECKSTYLE" "." ".*/report.xml$" "Checkstyle"     \
-  #         -diff-to $(git merge-base HEAD origin/main) -pv false
-
-  #     - uses: github/codeql-action/upload-sarif@v3
-  #       if: success() || failure()
-  #       with:
-  #         sarif_file: sarif-report.json
-
-
-  checkstyle_new:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
-          cache: 'gradle'
-
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v3.3.2
-        with:
-          arguments: --continue checkstyleMainChanged
-      - run: |
-          npx violations-command-line -sarif sarif-report.json \
-          -v "CHECKSTYLE" "." ".*/build/reports/checkstyle/main_diff.xml$" "Checkstyle"
-
-      #-diff-from $(git merge-base HEAD origin/main)
-      # - run: python3 ./.github/printcs.py */build/reports/checkstyle/main_diff.xml
-          
-      # $(git merge-base HEAD origin/main)
-
-      - uses: github/codeql-action/upload-sarif@v3
-        if: success() || failure()
-        with:
-          sarif_file: sarif-report.json          
-
-  pmd:
-    runs-on: ubuntu-latest      
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
-          cache: 'gradle'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v3.3.2
-        with:
-          arguments: --continue pmdMainChanged
-
-      # - run: python3 ./.github/printAnnotations.py */build/reports/pmd/main.xml
-
-      - run: |
-          npx violations-command-line -sarif pmd-report.json \
-          -v "PMD" "." ".*/build/reports/pmd/main_diff.xml$" "PMD"
-
-      # -diff-from $(git merge-base HEAD origin/main)
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: pmd-report.json
+          arguments: --continue spotlessCheck
\ No newline at end of file
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index efdedd8caf2..00000000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches:
-      - "main"
-      - "KeY-*"
-  schedule:
-    - cron: '21 21 * * 4'
-  merge_group:
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]        
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 00000000000..5749981d98f
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,49 @@
+## Copied from SonarCloud
+
+name: SonarCloud
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21
+          distribution: 'zulu' 
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v3
+        with:
+            build-scan-publish: true
+            build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+            build-scan-terms-of-use-agree: "yes"
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GRADLE_OPTS: "-Xmx6g -XX:MaxMetaspaceSize=512m  -Dfile.encoding=UTF-8"
+        run: ./gradlew --parallel --continue  -DjacocoEnabled=true -x :key.core.symbolic_execution:test -x :key.core.proof_references:test classes testClasses :key.util:test jacocoTestReport sonar
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 935addaa9a8..487eb193e5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,8 +25,19 @@ plugins {
 
     // EISOP Checker Framework
     id "org.checkerframework" version "0.6.39"
+
+    id("org.sonarqube") version "5.0.0.4638"
+}
+
+sonar {
+  properties {
+    property "sonar.projectKey", "KeYProject_key"
+    property "sonar.organization", "keyproject"
+    property "sonar.host.url", "https://sonarcloud.io"
+  }
 }
 
+
 // Configure this project for use inside IntelliJ:
 idea {
     module {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000000..7937f1c737f
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
\ No newline at end of file
diff --git a/recoder/src/main/java/recoder/abstraction/IntersectionType.java b/recoder/src/main/java/recoder/abstraction/IntersectionType.java
index 49186270c8c..c3e5cc0b836 100644
--- a/recoder/src/main/java/recoder/abstraction/IntersectionType.java
+++ b/recoder/src/main/java/recoder/abstraction/IntersectionType.java
@@ -11,7 +11,7 @@
 import recoder.service.ProgramModelInfo;
 
 /**
- * Represents an intersection type, which was introduced in java 5. See JLS, 3rd edition, �4.9 for
+ * Represents an intersection type, which was introduced in java 5. See JLS, 3rd edition, §4.9 for
  * details.
  *
  * @author Tobias Gutzmann
diff --git a/recoder/src/main/java/recoder/kit/transformation/java5to4/EnhancedFor2For.java b/recoder/src/main/java/recoder/kit/transformation/java5to4/EnhancedFor2For.java
index 52e98bccb81..17e4f816382 100644
--- a/recoder/src/main/java/recoder/kit/transformation/java5to4/EnhancedFor2For.java
+++ b/recoder/src/main/java/recoder/kit/transformation/java5to4/EnhancedFor2For.java
@@ -25,7 +25,7 @@
 import recoder.list.generic.ASTList;
 
 /**
- * converts an enhanced for loop to an "old style" for loop. This follows JLS 3rd edition, �14.14.2.
+ * converts an enhanced for loop to an "old style" for loop. This follows JLS 3rd edition, §14.14.2.
  * <p>
  * Currently, if given enhanced for iterates over an array, this will replace the enhanced for with
  * a statement block and not inline it into a possibly given statement block, yielding possibly not

From f024c0736b903024dc8df961bd21622214945728 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Wed, 26 Jun 2024 16:11:29 +0200
Subject: [PATCH 20/50] fix after refactoring + spotless

---
 .../main/java/de/uka/ilkd/key/control/KeYEnvironment.java    | 3 +--
 .../src/main/java/org/keyproject/key/api/TermActionUtil.java | 2 +-
 .../java/org/keyproject/key/api/adapters/KeyAdapter.java     | 3 ++-
 .../main/java/org/keyproject/key/api/data/FunctionDesc.java  | 5 +++--
 .../src/main/java/org/keyproject/key/api/data/SortDesc.java  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index 18a2b12b0d5..bbc57b344ca 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -21,13 +21,12 @@
 import de.uka.ilkd.key.proof.io.AbstractProblemLoader.ReplayResult;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.proof.mgt.SpecificationRepository;
-
 import de.uka.ilkd.key.rule.Rule;
 import de.uka.ilkd.key.speclang.Contract;
 import de.uka.ilkd.key.util.KeYTypeUtil;
-import org.key_project.util.collection.Pair;
 
 import org.key_project.util.collection.ImmutableSet;
+import org.key_project.util.collection.Pair;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index c65a93d677a..4e121061d84 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -9,7 +9,6 @@
 
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.control.ProofControl;
-import de.uka.ilkd.key.logic.Name;
 import de.uka.ilkd.key.logic.PosInOccurrence;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFacade;
@@ -17,6 +16,7 @@
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
 
+import org.key_project.logic.Name;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 53cd4cec09c..bd423049595 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -7,9 +7,10 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 
-import de.uka.ilkd.key.logic.op.Function;
 import de.uka.ilkd.key.macros.ProofMacro;
 
+import org.key_project.logic.op.Function;
+
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 3b7238f676e..d664c5a3981 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -5,7 +5,8 @@
 
 import java.util.List;
 
-import de.uka.ilkd.key.logic.op.Function;
+import org.key_project.logic.op.Function;
+
 
 /**
  * @author Alexander Weigl
@@ -14,7 +15,7 @@
 public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts, boolean rigid,
                            boolean unique, boolean skolemConstant) {
     public static FunctionDesc from(Function fn) {
-        return new FunctionDesc(fn.name().toString(), fn.proofToString(),
+        return new FunctionDesc(fn.name().toString(), fn.sort().declarationString(),
                 SortDesc.from(fn.sort()),
                 fn.argSorts().stream().map(SortDesc::from).toList(),
                 fn.isRigid(),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index 797f8ccb16f..587803ac2e6 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -5,7 +5,7 @@
 
 import java.util.List;
 
-import de.uka.ilkd.key.logic.sort.Sort;
+import org.key_project.logic.sort.Sort;
 
 /**
  * @author Alexander Weigl

From 8c33e8c1d397739d136106323a368deec035d527 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 20 Oct 2024 16:12:52 +0200
Subject: [PATCH 21/50] wip

---
 build.gradle                                  |   8 +-
 keyext.api.doc/build.gradle                   |   4 +-
 keyext.api.doc/src/main/java/DocGen.java      | 190 -----------------
 .../org/key_project/key/api/doc/DocGen.java   | 107 ++++++++++
 .../key/api/doc}/ExtractMetaData.java         | 198 ++++++++++--------
 .../key_project/key/api/doc}/Metamodel.java   |   2 +-
 .../key/api/doc/PythonGenerator.java}         |  22 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  14 +-
 .../key/api/data/TermActionDesc.java          |  25 ++-
 .../keyproject/key/api/data/package-info.java |   7 +
 .../org/keyproject/key/api/package-info.java  |   7 +
 .../key/api/remoteapi/package-info.java       |   7 +
 .../key/api/remoteclient/package-info.java    |   7 +
 13 files changed, 284 insertions(+), 314 deletions(-)
 delete mode 100644 keyext.api.doc/src/main/java/DocGen.java
 create mode 100644 keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
 rename keyext.api.doc/src/main/java/{ => org/key_project/key/api/doc}/ExtractMetaData.java (61%)
 rename keyext.api.doc/src/main/java/{ => org/key_project/key/api/doc}/Metamodel.java (96%)
 rename keyext.api.doc/src/main/java/{PythionGenerator.java => org/key_project/key/api/doc/PythonGenerator.java} (93%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/package-info.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java

diff --git a/build.gradle b/build.gradle
index b7a41f249f6..aa60dbfd676 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,8 +73,8 @@ subprojects {
     version = rootProject.version
 
     java {
-        sourceCompatibility = 17
-        targetCompatibility = 17
+        sourceCompatibility = 22
+        targetCompatibility = 22
     }
 
     repositories {
@@ -111,8 +111,8 @@ subprojects {
     tasks.withType(JavaCompile) {
         // Setting UTF-8 as the java source encoding.
         options.encoding = "UTF-8"
-        // Setting the release to Java 17
-        options.release = 17
+        // Setting the release to Java 22
+        options.release = 22
     }
 
     tasks.withType(Javadoc) {
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index 84a1789e01f..0c275f1d19e 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation(project(":keyext.api"))
-    implementation("com.github.javaparser:javaparser-core:3.25.5")
-    implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.5")
+    implementation("com.github.javaparser:javaparser-symbol-solver-core:3.26.1")
+    implementation("info.picocli:picocli:4.7.6")
 }
\ No newline at end of file
diff --git a/keyext.api.doc/src/main/java/DocGen.java b/keyext.api.doc/src/main/java/DocGen.java
deleted file mode 100644
index 8ab51393898..00000000000
--- a/keyext.api.doc/src/main/java/DocGen.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
-public class DocGen implements Supplier<String> {
-    private final Metamodel.KeyApi metamodel;
-    private PrintWriter out;
-    private final StringWriter target = new StringWriter();
-
-    public DocGen(Metamodel.KeyApi metamodel) {
-        this.metamodel = metamodel;
-    }
-
-    @Override
-    public String get() {
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-            printHeader();
-
-            out.format("## Types%n");
-            metamodel.types()
-                    .stream().sorted(Comparator.comparing(Metamodel.Type::name))
-                    .forEach(this::printType);
-
-            out.format("## Endpoints%n");
-            metamodel.endpoints()
-                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
-                    .forEach(this::endpoints);
-            printFooter();
-        }
-        return target.toString();
-    }
-
-    private void printFooter() {
-
-    }
-
-    private void printHeader() {
-
-
-    }
-
-    private void endpoints(Metamodel.Endpoint endpoint) {
-        // out.format("## Group: %s%n%n", getJsonSegment(typeDeclaration));
-        // out.println(getJavaDoc(typeDeclaration));
-        // out.println("\n");
-
-        var direction = "";
-        if (endpoint instanceof Metamodel.ServerRequest sr)
-            direction = "client -> server";
-        else if (endpoint instanceof Metamodel.ClientRequest sr)
-            direction = "server -> client";
-        else if (endpoint instanceof Metamodel.ServerNotification sr)
-            direction = "client ~~> server";
-        else if (endpoint instanceof Metamodel.ClientNotification sr)
-            direction = "server ~~> client";
-
-        out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
-        out.format("```%n");
-        var args = endpoint.args();
-        final var a = args.stream()
-                .map(it -> "%s : %s".formatted(it.name(), it.type()))
-                .collect(Collectors.joining(", "));
-        if (endpoint instanceof Metamodel.ServerRequest sr) {
-            out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-        } else if (endpoint instanceof Metamodel.ClientRequest sr)
-            out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-        else if (endpoint instanceof Metamodel.ServerNotification sr)
-            out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-        else if (endpoint instanceof Metamodel.ClientNotification sr)
-            out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
-        out.format("```%n");
-
-        out.println(endpoint.documentation());
-        out.println();
-    }
-
-    private void printType(Metamodel.Type type) {
-        out.format("### Type: %s%n", type.name());
-        if (type instanceof Metamodel.ObjectType ot) {
-            out.format("""
-                    ```
-                    type %s {
-                     %s
-                    }
-                    ```
-                    """.formatted(type.name(),
-                ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
-                        .collect(Collectors.joining("\n"))));
-        }
-
-        if (type instanceof Metamodel.EnumType et) {
-            out.format("""
-                    ```
-                    enum %s { %s }
-                    ```
-                    """.formatted(type.name(), String.join(", ", et.values())));
-            out.format(type.documentation());
-        }
-        out.format(type.documentation());
-        out.println();
-    }
-
-    /*
-     * private static String getCallName (MethodDeclaration m, TypeDeclaration < ?>td){
-     * var annotationExpr = m.getAnnotationByName("JsonNotification").or(
-     * () -> m.getAnnotationByName("JsonRequest"))
-     * .orElseThrow();
-     *
-     * var segment = getJsonSegment(td) + "/";
-     * String name = "";
-     *
-     * if (annotationExpr.isMarkerAnnotationExpr()) {
-     * name = m.getNameAsString();
-     * } else if (annotationExpr.isSingleMemberAnnotationExpr()) {
-     * var sma = annotationExpr.asSingleMemberAnnotationExpr();
-     * name = sma.getMemberValue().asLiteralStringValueExpr().getValue();
-     * } else {
-     * var ne = annotationExpr.asNormalAnnotationExpr();
-     * for (MemberValuePair pair : ne.getPairs()) {
-     * switch (pair.getName().asString()) {
-     * case "value":
-     * name = pair.getValue().asLiteralStringValueExpr().getValue();
-     * break;
-     * case "useSegment":
-     * if (!pair.getValue().asBooleanLiteralExpr().getValue()) {
-     * segment = "";
-     * }
-     * }
-     * }
-     * }
-     * return segment + name;
-     * }
-     *
-     * @Nonnull
-     * private static String getJavaDoc (NodeWithJavadoc < ? > typeDeclaration){
-     * if (typeDeclaration.getJavadoc().isPresent()) {
-     * final var javadoc = typeDeclaration.getJavadoc().get();
-     * return javadoc.getDescription().toText()
-     * + "\n\n"
-     * + javadoc.getBlockTags().stream().map(it -> "* " + it.toText())
-     * .collect(Collectors.joining("\n"));
-     * }
-     * return "";
-     * }
-     *
-     * private static String type (MethodDeclaration method){
-     * if (method.getAnnotationByName("JsonNotification").isPresent())
-     * return "notification";
-     * if (method.getAnnotationByName("JsonRequest").isPresent())
-     * return "request";
-     * return "";
-     * }
-     *
-     * private static boolean isExported (MethodDeclaration method){
-     * return method.getAnnotationByName("JsonNotification").isPresent()
-     * || method.getAnnotationByName("JsonRequest").isPresent();
-     * }
-     *
-     * private void printHeader () {
-     * out.format("# KeY-API%n%n");
-     * }
-     *
-     * private void printFooter () {
-     * }
-     *
-     *
-     * /*
-     * private static boolean hasJsonSegment(TypeDeclaration<?> it) {
-     * return it.getAnnotationByName("JsonSegment").isPresent();
-     * }
-     *
-     * private static String getJsonSegment(TypeDeclaration<?> it) {
-     * var ae = it.getAnnotationByName("JsonSegment").get();
-     * return ae.asSingleMemberAnnotationExpr().getMemberValue()
-     * .asLiteralStringValueExpr().getValue();
-     * }
-     */
-
-}
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
new file mode 100644
index 00000000000..1521d2351ce
--- /dev/null
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -0,0 +1,107 @@
+package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (29.10.23)
+ */
+public class DocGen implements Supplier<String> {
+    private final Metamodel.KeyApi metamodel;
+    private PrintWriter out;
+
+    public DocGen(Metamodel.KeyApi metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public String get() {
+        final StringWriter target = new StringWriter();
+        try (var out = new PrintWriter(target)) {
+            this.out = out;
+            printHeader();
+
+            out.format("## Types%n");
+            metamodel.types()
+                    .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                    .forEach(this::printType);
+
+            out.format("## Endpoints%n");
+            metamodel.endpoints()
+                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                    .forEach(this::endpoints);
+            printFooter();
+        }
+        return target.toString();
+    }
+
+    private void printFooter() {
+
+    }
+
+    private void printHeader() {
+
+
+    }
+
+    private void endpoints(Metamodel.Endpoint endpoint) {
+        var direction = switch (endpoint) {
+            case Metamodel.ServerRequest sr -> "client -> server";
+            case Metamodel.ClientRequest sr -> "server -> client";
+            case Metamodel.ServerNotification sr -> "client ~~> server";
+            case Metamodel.ClientNotification sr -> "server ~~> client";
+        };
+
+        out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
+        out.format("```%n");
+        var args = endpoint.args();
+        final var a = args.stream()
+                .map(it -> "%s : %s".formatted(it.name(), it.type()))
+                .collect(Collectors.joining(", "));
+        switch (endpoint) {
+            case Metamodel.ServerRequest sr -> out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+            case Metamodel.ClientRequest sr -> out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+            case Metamodel.ServerNotification _ -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+            case Metamodel.ClientNotification _ -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+            default -> {
+            }
+        }
+        out.format("```%n");
+
+        out.println(endpoint.documentation());
+        out.println();
+    }
+
+    private void printType(Metamodel.Type type) {
+        out.format("### Type: %s%n", type.name());
+        if (type instanceof Metamodel.ObjectType ot) {
+            out.format("""
+                    ```
+                    type %s {
+                     %s
+                    }
+                    ```
+                    """.formatted(type.name(),
+                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                            .collect(Collectors.joining("\n"))));
+        }
+
+        if (type instanceof Metamodel.EnumType et) {
+            out.format("""
+                    ```
+                    enum %s { %s }
+                    ```
+                    """.formatted(type.name(), String.join(", ", et.values())));
+            out.format(type.documentation());
+        }
+        out.format(type.documentation());
+        out.println();
+    }
+}
diff --git a/keyext.api.doc/src/main/java/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
similarity index 61%
rename from keyext.api.doc/src/main/java/ExtractMetaData.java
rename to keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index d053b9268d3..e605b1ceb39 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -1,46 +1,83 @@
-/* This file is part of KeY - https://key-project.org
+package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
-import de.uka.ilkd.key.proof.Proof;
-
-import com.github.javaparser.JavaParser;
+import com.github.javaparser.ParseProblemException;
 import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
-import com.google.gson.*;
+import com.github.javaparser.javadoc.Javadoc;
+import com.github.javaparser.javadoc.description.JavadocDescription;
+import com.github.javaparser.utils.SourceRoot;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializer;
+import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
-import sun.misc.Unsafe;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
-public class ExtractMetaData {
-    private static PrintWriter out;
+@NullMarked
+@CommandLine.Command(name = "gendoc",
+        mixinStandardHelpOptions = true,
+        version = "gendoc 1.0",
+        description = "Generates the documentation for key.api")
+public class ExtractMetaData implements Callable<Integer> {
+    private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
+    private final List<Metamodel.Type> types = new LinkedList<>();
+    private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
+    private SourceRoot sourceRoot = new SourceRoot(Paths.get("."));
+
 
-    private static final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
-    private static final List<Metamodel.Type> types = new LinkedList<>();
-    private static final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
+    @Option(names = {"-s", "--source"}, description = "Source folder for getting JavaDoc")
+    private @Nullable Path source = Paths.get("keyext.api", "src", "main", "java");
+
+    @Option(names = {"-o", "--output"}, description = "Output folder")
+    private Path output = Paths.get("out");
 
     public static void main(String[] args) {
+        int exitCode = new CommandLine(new ExtractMetaData()).execute(args);
+        System.exit(exitCode);
+    }
+
+    @Override
+    public Integer call() throws IOException {
+        if (source != null) {
+            ParserConfiguration config = new ParserConfiguration();
+            config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21);
+            config.setAttributeComments(true);
+            config.setLexicalPreservationEnabled(false);
+            config.setStoreTokens(false);
+            config.setIgnoreAnnotationsWhenAttributingComments(true);
+            config.setDoNotAssignCommentsPrecedingEmptyLines(true);
+            sourceRoot = new SourceRoot(source, config);
+        }
+
         for (Method method : KeyApi.class.getMethods()) {
             addServerEndpoint(method);
         }
@@ -49,17 +86,20 @@ public static void main(String[] args) {
             addClientEndpoint(method);
         }
 
+        Files.createDirectories(output);
+
         runGenerator("api.meta.json", (a) -> () -> getGson().toJson(a));
         runGenerator("api.meta.md", DocGen::new);
-        runGenerator("keydata.py", PythionGenerator.PyDataGen::new);
-        runGenerator("server.py", PythionGenerator.PyApiGen::new);
+        runGenerator("keydata.py", PythonGenerator.PyDataGen::new);
+        runGenerator("server.py", PythonGenerator.PyApiGen::new);
+
+        return 0;
     }
 
-    private static void runGenerator(String target,
-            Function<Metamodel.KeyApi, Supplier<String>> api) {
+    private void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
         try {
             var n = api.apply(keyApi);
-            Files.writeString(Paths.get(target), n.get());
+            Files.writeString(output.resolve(target), n.get());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -68,22 +108,17 @@ private static void runGenerator(String target,
     private static Gson getGson() {
         return new GsonBuilder()
                 .setPrettyPrinting()
-                .registerTypeAdapter(Type.class, new JsonSerializer<Metamodel.Type>() {
-                    @Override
-                    public JsonElement serialize(Metamodel.Type src, Type typeOfSrc,
-                            JsonSerializationContext context) {
-                        JsonObject json = (JsonObject) context.serialize(src);
-                        json.addProperty("kind", src.kind());
-                        return json;
-                    }
+                .registerTypeAdapter(Type.class, (JsonSerializer<Metamodel.Type>) (src, typeOfSrc, context) -> {
+                    JsonObject json = (JsonObject) context.serialize(src);
+                    json.addProperty("kind", src.kind());
+                    return json;
                 })
                 .create();
     }
 
-    private static void addServerEndpoint(Method method) {
+    private void addServerEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
-        if (jsonSegment == null)
-            return;
+        if (jsonSegment == null) return;
         var segment = jsonSegment.value();
 
         var req = method.getAnnotation(JsonRequest.class);
@@ -118,28 +153,32 @@ private static void addServerEndpoint(Method method) {
         throw new IllegalStateException();
     }
 
-    private static String findDocumentation(Method method) {
-        // TODO get compilation, get type, find method, getJavaDocComment()
-        return "";
+    private String findDocumentation(Method method) {
+        return findCompilationUnit(method.getDeclaringClass())
+                .map(it -> it.getMethodsByName(method.getName()))
+                .map(List::getFirst)
+                .flatMap(NodeWithJavadoc::getJavadoc)
+                .map(Javadoc::getDescription)
+                .map(JavadocDescription::toText)
+                .orElse("");
     }
 
-    private static List<Metamodel.Argument> translate(Parameter[] parameters) {
-        return Arrays.stream(parameters).map(ExtractMetaData::translate).toList();
+    private List<Metamodel.Argument> translate(Parameter[] parameters) {
+        return Arrays.stream(parameters).map(this::translate).toList();
     }
 
-    private static Metamodel.Argument translate(Parameter parameter) {
+    private Metamodel.Argument translate(Parameter parameter) {
         var type = getOrFindType(parameter.getType()).name();
         return new Metamodel.Argument(parameter.getName(), type);
     }
 
-    private static Metamodel.Type getOrFindType(Class<?> type) {
+    private Metamodel.Type getOrFindType(Class<?> type) {
         System.out.println(type);
         if (type == CompletableFuture.class) {
             return getOrFindType(type.getTypeParameters()[0].getClass());
         }
 
-        if (type == Unsafe.class || type == Class.class || type == Constructor.class
-                || type == Proof.class) {
+        if (type == Class.class || type == Constructor.class || type == Proof.class) {
             throw new IllegalStateException("Forbidden class reached!");
         }
 
@@ -178,12 +217,12 @@ private static Metamodel.Type getOrFindType(Class<?> type) {
         return a;
     }
 
-    private static Metamodel.Type createType(Class<?> type) {
+    private Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum())
             return new Metamodel.EnumType(type.getSimpleName(),
-                Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
-                documentation);
+                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                    documentation);
 
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
@@ -194,34 +233,23 @@ private static Metamodel.Type createType(Class<?> type) {
         return obj;
     }
 
-    private static String findDocumentation(Class<?> type) {
-        var parser = initJavaParser();
-        var fileName = findFileForType(type);
-
-        if (Files.exists(fileName)) {
-            try {
-                return parser.parse(fileName).getResult().flatMap(CompilationUnit::getPrimaryType)
-                        .flatMap(NodeWithJavadoc::getJavadocComment)
-                        .map(Comment::getContent).orElse("");
-            } catch (IOException e) {
-                e.printStackTrace();
-                return "";
-            }
-        } else
-            return "";
+    private String findDocumentation(Class<?> type) {
+        return findCompilationUnit(type)
+                .flatMap(NodeWithJavadoc::getJavadocComment)
+                .map(Comment::getContent)
+                .orElse("");
     }
 
-    private static Path findFileForType(Class<?> type) {
-        final var folderString = type.getPackageName().replaceAll("\\.", "/");
-        var folder = Paths.get("keyext.api", "src", "main", "java", folderString);
-        final Class<?> declaringClass = type.getDeclaringClass();
-        var fileName = (declaringClass != null ? declaringClass : type).getSimpleName() + ".java";
-        var file = folder.resolve(fileName);
-        return file;
+    private Optional<TypeDeclaration<?>> findCompilationUnit(Class<?> type) {
+        try {
+            return sourceRoot.parse(type.getPackageName(), type.getSimpleName() + ".java").getPrimaryType();
+        } catch (ParseProblemException e) {
+            return Optional.empty();
+        }
     }
 
 
-    private static void addClientEndpoint(Method method) {
+    private void addClientEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
         var segment = jsonSegment.value();
 
@@ -248,8 +276,8 @@ private static void addClientEndpoint(Method method) {
         }
     }
 
-    private static String callMethodName(String method, String segment, String userValue,
-            boolean useSegment) {
+    private static String callMethodName(String method, String segment, @Nullable String userValue,
+                                         boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -265,12 +293,12 @@ private static String callMethodName(String method, String segment, String userV
         }
     }
 
-    private static Metamodel.Type getOrFindType(Type genericReturnType) {
-        if (genericReturnType instanceof Class c)
+    private Metamodel.@Nullable Type getOrFindType(Type genericReturnType) {
+        if (genericReturnType instanceof Class<?> c)
             return getOrFindType(c);
         if (genericReturnType instanceof ParameterizedType pt) {
             if (Objects.equals(pt.getRawType().getTypeName(),
-                CompletableFuture.class.getTypeName())) {
+                    CompletableFuture.class.getTypeName())) {
                 return getOrFindType(pt.getActualTypeArguments()[0]);
             }
             if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
@@ -286,16 +314,4 @@ private static Metamodel.Type getOrFindType(Type genericReturnType) {
         }
         return null;
     }
-
-    static JavaParser initJavaParser() {
-        ParserConfiguration config = new ParserConfiguration();
-        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17_PREVIEW);
-        config.setAttributeComments(true);
-        config.setLexicalPreservationEnabled(false);
-        config.setStoreTokens(false);
-        config.setIgnoreAnnotationsWhenAttributingComments(true);
-        config.setDoNotAssignCommentsPrecedingEmptyLines(true);
-        return new JavaParser(config);
-    }
-
 }
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
similarity index 96%
rename from keyext.api.doc/src/main/java/Metamodel.java
rename to keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index 62146f0f5ee..e9b5780c95a 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -1,4 +1,4 @@
-/* This file is part of KeY - https://key-project.org
+package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
 import java.util.List;
diff --git a/keyext.api.doc/src/main/java/PythionGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
similarity index 93%
rename from keyext.api.doc/src/main/java/PythionGenerator.java
rename to keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 9fc222a1221..395991dba8f 100644
--- a/keyext.api.doc/src/main/java/PythionGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -1,4 +1,4 @@
-/* This file is part of KeY - https://key-project.org
+package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
 import java.io.PrintWriter;
@@ -12,12 +12,12 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public abstract class PythionGenerator implements Supplier<String> {
+public abstract class PythonGenerator implements Supplier<String> {
     protected final Metamodel.KeyApi metamodel;
     protected PrintWriter out;
     protected final StringWriter target = new StringWriter();
 
-    public PythionGenerator(Metamodel.KeyApi metamodel) {
+    public PythonGenerator(Metamodel.KeyApi metamodel) {
         this.metamodel = metamodel;
     }
 
@@ -34,8 +34,7 @@ public String get() {
 
     protected String asPython(String typeName) {
         return switch (typeName) {
-            case "INT" -> "int";
-            case "LONG" -> "int";
+            case "INT", "LONG" -> "int";
             case "STRING" -> "str";
             case "BOOL" -> "bool";
             case "DOUBLE" -> "float";
@@ -57,9 +56,8 @@ protected String asPython(Metamodel.Type t) {
 
         if (t instanceof Metamodel.BuiltinType bt) {
             return switch (bt) {
-            case INT -> "int";
-            case LONG -> "int";
-            case STRING -> "str";
+            case INT, LONG -> "int";
+                case STRING -> "str";
             case BOOL -> "bool";
             case DOUBLE -> "float";
             };
@@ -73,7 +71,7 @@ protected Metamodel.Type findType(String typeName) {
     }
 
 
-    public static class PyApiGen extends PythionGenerator {
+    public static class PyApiGen extends PythonGenerator {
         public PyApiGen(Metamodel.KeyApi metamodel) {
             super(metamodel);
         }
@@ -123,7 +121,7 @@ private void clientEndpoint(Metamodel.Endpoint endpoint) {
                 out.format("    def %s(self, %s):%n", endpoint.name().replace("/", "_"), args);
             }
             out.format("        \"\"\"%s\"\"\"%n%n", endpoint.documentation());
-            out.format("        pass".formatted(endpoint.name(), ""));
+            out.format("        pass");
             out.println();
             out.println();
         }
@@ -134,7 +132,7 @@ class KeyServer(ServerBase):%n
                         def __init__(self, endpoint : LspEndpoint):
                             super().__init__(endpoint)
 
-                     """);
+                    """);
             sorted.forEach(this::serverEndpoint);
         }
 
@@ -169,7 +167,7 @@ private void serverEndpoint(Metamodel.Endpoint endpoint) {
     }
 
 
-    public static class PyDataGen extends PythionGenerator {
+    public static class PyDataGen extends PythonGenerator {
         public PyDataGen(Metamodel.KeyApi metamodel) {
             super(metamodel);
         }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 1e3a0539711..44cb61cf8b5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -389,8 +389,6 @@ public CompletableFuture<ProofId> loadExample(String id) {
                     var proofId = new ProofId(envId, proof.name().toString());
                     return data.register(proofId, proof);
                 } catch (ProblemLoaderException e) {
-                    if (proof != null)
-                        proof.dispose();
                     if (env != null)
                         env.dispose();
                     throw new RuntimeException(e);
@@ -442,8 +440,6 @@ public CompletableFuture<ProofId> loadKey(String content) {
                 var proofId = new ProofId(envId, proof.name().toString());
                 return data.register(proofId, proof);
             } catch (ProblemLoaderException | IOException e) {
-                if (proof != null)
-                    proof.dispose();
                 if (env != null)
                     env.dispose();
                 throw new RuntimeException(e);
@@ -459,8 +455,8 @@ public CompletableFuture<ProofId> loadTerm(String term) {
     @Override
     public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params) {
         return CompletableFutures.computeAsync((c) -> {
-            Proof proof = null;
-            KeYEnvironment<?> env = null;
+            Proof proof;
+            KeYEnvironment<?> env;
             try {
                 var loader = control.load(JavaProfile.getDefaultProfile(),
                     params.keyFile(),
@@ -482,10 +478,6 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
                     return Either.forLeft(envId);
                 }
             } catch (ProblemLoaderException e) {
-                if (proof != null)
-                    proof.dispose();
-                if (env != null)
-                    env.dispose();
                 throw new RuntimeException(e);
             }
         });
@@ -579,6 +571,4 @@ public void showIssueDialog(Collection<PositionedString> issues) {
             super.showIssueDialog(issues);
         }
     }
-
-
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
index d9c619f4dea..1b4184e58dd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -6,9 +6,30 @@
 import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
 
 /**
+ * This class represents an action that can be executed on a term.
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record TermActionDesc(TermActionId commandId, String displayName, String description, String category,
-                             TermActionKind kind) {
+public record TermActionDesc(
+        /**
+         * Unique identification
+         */
+        TermActionId commandId,
+        /**
+         * A string to display to the user.
+         */
+        String displayName,
+        /**
+         * Long description of the action for the user.
+         */
+        String description,
+        /**
+         * A string identifying a category
+         */
+        String category,
+        /**
+         * Kind of the action
+         */
+        TermActionKind kind) {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
new file mode 100644
index 00000000000..6b8d1608b79
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked package org.keyproject.key.api.data;
+
+import org.jspecify.annotations.NullMarked;
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
new file mode 100644
index 00000000000..56416d92034
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked package org.keyproject.key.api;
+
+import org.jspecify.annotations.NullMarked;
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
new file mode 100644
index 00000000000..f0362f688b0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked package org.keyproject.key.api.remoteapi;
+
+import org.jspecify.annotations.NullMarked;
\ No newline at end of file
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
new file mode 100644
index 00000000000..cf1561a11d7
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked package org.keyproject.key.api.remoteclient;
+
+import org.jspecify.annotations.NullMarked;
\ No newline at end of file

From 8ece37547d9710bf5698d7ca1a7581a4edec0e2d Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 22 Nov 2024 22:38:21 +0100
Subject: [PATCH 22/50] start of a simple Java client

---
 .../uka/ilkd/key/rule/IntSemanticsTest.java   |  18 ++-
 .../org/key_project/key/api/doc/DocGen.java   |  18 ++-
 .../key/api/doc/ExtractMetaData.java          |  70 +++++-----
 .../key_project/key/api/doc/Metamodel.java    |   9 +-
 .../key/api/doc/PythonGenerator.java          |  11 +-
 .../keyproject/key/api/data/package-info.java |   5 +-
 .../org/keyproject/key/api/package-info.java  |   5 +-
 .../key/api/remoteapi/package-info.java       |   5 +-
 .../key/api/remoteclient/package-info.java    |   5 +-
 keyext.caching/build.gradle                   |   2 +-
 keyext.client.java/build.gradle               |  35 +++++
 .../keyextclientjava/HelloApplication.java    |  22 ++++
 .../formal/keyextclientjava/KeyRemote.java    |  10 ++
 .../formal/keyextclientjava/MyKeyClient.java  |  54 ++++++++
 .../iti/formal/keyextclientjava/RPCLayer.java | 120 ++++++++++++++++++
 .../formal/keyextclientjava/TreeNodeId.java   |   8 ++
 .../formal/keyextclientjava/hello-view.fxml   |  16 +++
 settings.gradle                               |   6 +-
 18 files changed, 360 insertions(+), 59 deletions(-)
 create mode 100644 keyext.client.java/build.gradle
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
 create mode 100644 keyext.client.java/src/main/resources/edu/kit/iti/formal/keyextclientjava/hello-view.fxml

diff --git a/key.core/src/test/java/de/uka/ilkd/key/rule/IntSemanticsTest.java b/key.core/src/test/java/de/uka/ilkd/key/rule/IntSemanticsTest.java
index 70f8b8fffa8..9a61ae41912 100644
--- a/key.core/src/test/java/de/uka/ilkd/key/rule/IntSemanticsTest.java
+++ b/key.core/src/test/java/de/uka/ilkd/key/rule/IntSemanticsTest.java
@@ -5,9 +5,7 @@
 
 import java.io.File;
 
-import de.uka.ilkd.key.api.KeYApi;
-import de.uka.ilkd.key.api.ProofApi;
-import de.uka.ilkd.key.api.ProofManagementApi;
+import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 
@@ -41,8 +39,8 @@ class IntSemanticsTest {
         "checkedOF/mOFCheck.proof" })
     void testSemanticsProvable(String filename) throws ProblemLoaderException {
         File proofFile = new File(TEST_DIR, filename);
-        ProofManagementApi pmapi = KeYApi.loadProof(proofFile);
-        Proof proof = pmapi.getLoadedProof().getProof();
+        var env = KeYEnvironment.load(proofFile);
+        Proof proof = env.getLoadedProof();
         // Proof should be reloaded completely now. If not, the int semantics are probably broken.
         Assertions.assertTrue(proof.closed());
     }
@@ -58,12 +56,12 @@ void testSemanticsProvable(String filename) throws ProblemLoaderException {
     @ValueSource(strings = { "java/mJavaWrong.key",
         "uncheckedOF/mBigintWrong.key",
         "checkedOF/mOFCheckWrong.key", })
-    void testSemanticsUnprovable(String filename) throws ProblemLoaderException {
+    void testSemanticsUnprovable(String filename)
+            throws ProblemLoaderException, InterruptedException {
         File keyFile = new File(TEST_DIR, filename);
-        ProofManagementApi pmapi = KeYApi.loadFromKeyFile(keyFile);
-        ProofApi proofApi = pmapi.getLoadedProof();
-        Proof proof = proofApi.getProof();
-        proofApi.getEnv().getProofControl().startAndWaitForAutoMode(proof);
+        final var env = KeYEnvironment.load(keyFile);
+        var proof = env.getLoadedProof();
+        env.getProofControl().startAndWaitForAutoMode(proof);
         // we expect that exactly one branch (the overflow check) is open now:
         Assertions.assertEquals(1, proof.openGoals().size());
     }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index 1521d2351ce..c71335d2cf6 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -1,6 +1,12 @@
-package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
+/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
+package org.key_project.key.api.doc;/*
+                                     * This file is part of KeY - https://key-project.org
+                                     * KeY is licensed under the GNU General Public License Version
+                                     * 2
+                                     * SPDX-License-Identifier: GPL-2.0-only
+                                     */
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -67,8 +73,8 @@ private void endpoints(Metamodel.Endpoint endpoint) {
         switch (endpoint) {
             case Metamodel.ServerRequest sr -> out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
             case Metamodel.ClientRequest sr -> out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ServerNotification _ -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-            case Metamodel.ClientNotification _ -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+            case Metamodel.ServerNotification ignored -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+            case Metamodel.ClientNotification ignored -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
             default -> {
             }
         }
@@ -88,9 +94,9 @@ private void printType(Metamodel.Type type) {
                     }
                     ```
                     """.formatted(type.name(),
-                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                            .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
-                            .collect(Collectors.joining("\n"))));
+                ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                        .collect(Collectors.joining("\n"))));
         }
 
         if (type instanceof Metamodel.EnumType et) {
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index e605b1ceb39..86a9bb7e945 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -1,6 +1,26 @@
-package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
+/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
+package org.key_project.key.api.doc;/*
+                                     * This file is part of KeY - https://key-project.org
+                                     * KeY is licensed under the GNU General Public License Version
+                                     * 2
+                                     * SPDX-License-Identifier: GPL-2.0-only
+                                     */
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import de.uka.ilkd.key.proof.Proof;
 
 import com.github.javaparser.ParseProblemException;
 import com.github.javaparser.ParserConfiguration;
@@ -14,7 +34,6 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializer;
-import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
@@ -26,27 +45,15 @@
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
 @NullMarked
 @CommandLine.Command(name = "gendoc",
-        mixinStandardHelpOptions = true,
-        version = "gendoc 1.0",
-        description = "Generates the documentation for key.api")
+    mixinStandardHelpOptions = true,
+    version = "gendoc 1.0",
+    description = "Generates the documentation for key.api")
 public class ExtractMetaData implements Callable<Integer> {
     private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
     private final List<Metamodel.Type> types = new LinkedList<>();
@@ -54,10 +61,10 @@ public class ExtractMetaData implements Callable<Integer> {
     private SourceRoot sourceRoot = new SourceRoot(Paths.get("."));
 
 
-    @Option(names = {"-s", "--source"}, description = "Source folder for getting JavaDoc")
+    @Option(names = { "-s", "--source" }, description = "Source folder for getting JavaDoc")
     private @Nullable Path source = Paths.get("keyext.api", "src", "main", "java");
 
-    @Option(names = {"-o", "--output"}, description = "Output folder")
+    @Option(names = { "-o", "--output" }, description = "Output folder")
     private Path output = Paths.get("out");
 
     public static void main(String[] args) {
@@ -108,17 +115,19 @@ private void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<Str
     private static Gson getGson() {
         return new GsonBuilder()
                 .setPrettyPrinting()
-                .registerTypeAdapter(Type.class, (JsonSerializer<Metamodel.Type>) (src, typeOfSrc, context) -> {
-                    JsonObject json = (JsonObject) context.serialize(src);
-                    json.addProperty("kind", src.kind());
-                    return json;
-                })
+                .registerTypeAdapter(Type.class,
+                    (JsonSerializer<Metamodel.Type>) (src, typeOfSrc, context) -> {
+                        JsonObject json = (JsonObject) context.serialize(src);
+                        json.addProperty("kind", src.kind());
+                        return json;
+                    })
                 .create();
     }
 
     private void addServerEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
-        if (jsonSegment == null) return;
+        if (jsonSegment == null)
+            return;
         var segment = jsonSegment.value();
 
         var req = method.getAnnotation(JsonRequest.class);
@@ -221,8 +230,8 @@ private Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum())
             return new Metamodel.EnumType(type.getSimpleName(),
-                    Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
-                    documentation);
+                Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
+                documentation);
 
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
@@ -242,7 +251,8 @@ private String findDocumentation(Class<?> type) {
 
     private Optional<TypeDeclaration<?>> findCompilationUnit(Class<?> type) {
         try {
-            return sourceRoot.parse(type.getPackageName(), type.getSimpleName() + ".java").getPrimaryType();
+            return sourceRoot.parse(type.getPackageName(), type.getSimpleName() + ".java")
+                    .getPrimaryType();
         } catch (ParseProblemException e) {
             return Optional.empty();
         }
@@ -277,7 +287,7 @@ private void addClientEndpoint(Method method) {
     }
 
     private static String callMethodName(String method, String segment, @Nullable String userValue,
-                                         boolean useSegment) {
+            boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -298,7 +308,7 @@ private static String callMethodName(String method, String segment, @Nullable St
             return getOrFindType(c);
         if (genericReturnType instanceof ParameterizedType pt) {
             if (Objects.equals(pt.getRawType().getTypeName(),
-                    CompletableFuture.class.getTypeName())) {
+                CompletableFuture.class.getTypeName())) {
                 return getOrFindType(pt.getActualTypeArguments()[0]);
             }
             if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index e9b5780c95a..d71d2c62b30 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -1,6 +1,13 @@
-package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
+/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
+package org.key_project.key.api.doc;/*
+                                     * This file is part of KeY - https://key-project.org
+                                     * KeY is licensed under the GNU General Public License Version
+                                     * 2
+                                     * SPDX-License-Identifier: GPL-2.0-only
+                                     */
+
 import java.util.List;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 395991dba8f..616372e5af5 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -1,6 +1,13 @@
-package org.key_project.key.api.doc;/* This file is part of KeY - https://key-project.org
+/* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
+package org.key_project.key.api.doc;/*
+                                     * This file is part of KeY - https://key-project.org
+                                     * KeY is licensed under the GNU General Public License Version
+                                     * 2
+                                     * SPDX-License-Identifier: GPL-2.0-only
+                                     */
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -57,7 +64,7 @@ protected String asPython(Metamodel.Type t) {
         if (t instanceof Metamodel.BuiltinType bt) {
             return switch (bt) {
             case INT, LONG -> "int";
-                case STRING -> "str";
+            case STRING -> "str";
             case BOOL -> "bool";
             case DOUBLE -> "float";
             };
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
index 6b8d1608b79..39ecb9745a4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
@@ -2,6 +2,7 @@
  * @author Alexander Weigl
  * @version 1 (20.10.24)
  */
-@NullMarked package org.keyproject.key.api.data;
+@NullMarked
+package org.keyproject.key.api.data;
 
-import org.jspecify.annotations.NullMarked;
\ No newline at end of file
+import org.jspecify.annotations.NullMarked;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
index 56416d92034..c979030e065 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
@@ -2,6 +2,7 @@
  * @author Alexander Weigl
  * @version 1 (20.10.24)
  */
-@NullMarked package org.keyproject.key.api;
+@NullMarked
+package org.keyproject.key.api;
 
-import org.jspecify.annotations.NullMarked;
\ No newline at end of file
+import org.jspecify.annotations.NullMarked;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
index f0362f688b0..ccaca3e03b6 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
@@ -2,6 +2,7 @@
  * @author Alexander Weigl
  * @version 1 (20.10.24)
  */
-@NullMarked package org.keyproject.key.api.remoteapi;
+@NullMarked
+package org.keyproject.key.api.remoteapi;
 
-import org.jspecify.annotations.NullMarked;
\ No newline at end of file
+import org.jspecify.annotations.NullMarked;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
index cf1561a11d7..2151dd10601 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
@@ -2,6 +2,7 @@
  * @author Alexander Weigl
  * @version 1 (20.10.24)
  */
-@NullMarked package org.keyproject.key.api.remoteclient;
+@NullMarked
+package org.keyproject.key.api.remoteclient;
 
-import org.jspecify.annotations.NullMarked;
\ No newline at end of file
+import org.jspecify.annotations.NullMarked;
diff --git a/keyext.caching/build.gradle b/keyext.caching/build.gradle
index 45cf447440d..5f1e06b2828 100644
--- a/keyext.caching/build.gradle
+++ b/keyext.caching/build.gradle
@@ -3,6 +3,6 @@ description "Caching of provable nodes to make proving with KeY faster."
 dependencies {
     implementation project(":key.core")
     implementation project(":key.ui")
-
     implementation project(":keyext.slicing")
+    implementation "com.google.code.gson:gson:2.11.0"
 }
\ No newline at end of file
diff --git a/keyext.client.java/build.gradle b/keyext.client.java/build.gradle
new file mode 100644
index 00000000000..430cc898bd2
--- /dev/null
+++ b/keyext.client.java/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'org.javamodularity.moduleplugin' version '1.8.12'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
+}
+
+repositories {
+    mavenCentral()
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+application {
+    mainClass = 'edu.kit.iti.formal.keyextclientjava.HelloApplication'
+}
+
+javafx {
+    version = '21.0.5'
+    modules = ['javafx.controls', 'javafx.fxml']
+}
+
+dependencies {
+    implementation('org.controlsfx:controlsfx:11.2.1')
+    implementation('org.kordamp.ikonli:ikonli-javafx:12.3.1')
+    implementation('org.kordamp.ikonli:ikonli-fontawesome5-pack:12.3.1')
+    implementation('org.kordamp.bootstrapfx:bootstrapfx-core:0.4.0')
+    implementation('com.google.code.gson:gson:2.11.0')
+}
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
new file mode 100644
index 00000000000..b2b739c9baa
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
@@ -0,0 +1,22 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class HelloApplication extends Application {
+    @Override
+    public void start(Stage stage) throws IOException {
+        Scene scene = new Scene(new MyKeyClient().root, 320, 240);
+        stage.setTitle("KeY Demo");
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
new file mode 100644
index 00000000000..fa6cb27c097
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
@@ -0,0 +1,10 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public class KeyRemote {
+    public KeyRemote(RPCLayer rpcLayer) {
+    }
+}
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
new file mode 100644
index 00000000000..12fd1aa6bed
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -0,0 +1,54 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+import javafx.geometry.Orientation;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.stage.FileChooser;
+import org.controlsfx.glyphfont.FontAwesome;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
+import org.kordamp.ikonli.javafx.FontIcon;
+
+import javax.swing.*;
+import java.io.IOException;
+import java.util.concurrent.ForkJoinPool;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public class MyKeyClient {
+    private static final String JAR_FILE = "";
+    private final ToolBar toolbar = new ToolBar();
+    private final Label txtStatus = new Label("Yeah!");
+    public final BorderPane root = new BorderPane();
+    private final TreeView<TreeNodeId> tnid = new TreeView<>();
+    private final TextArea txtSequentView = new TextArea();
+
+    private final FileChooser fc = new FileChooser();
+
+    public MyKeyClient() {
+        //region toolbar
+        var btnOpen = new Button("Open", new FontIcon(FontAwesomeRegular.FOLDER_OPEN));
+        btnOpen.setOnAction(actionEvent -> openFile());
+        toolbar.getItems().setAll(btnOpen, new Separator(Orientation.VERTICAL));
+        //endregion
+
+        var splitCenter = new SplitPane(tnid, txtSequentView);
+        splitCenter.setDividerPositions(.2);
+        root.setTop(toolbar);
+        root.setCenter(splitCenter);
+        root.setBottom(txtStatus);
+
+        var startKey = ForkJoinPool.commonPool().submit(this::startKey);
+    }
+
+    private Object startKey() throws IOException {
+        return new KeyRemote(RPCLayer.startWithCLI(JAR_FILE));
+
+    }
+
+    private void openFile() {
+        fc.showOpenDialog(null);
+    }
+}
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
new file mode 100644
index 00000000000..70eabaefe79
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
@@ -0,0 +1,120 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.io.*;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public final class RPCLayer {
+    private final GsonBuilder builder = new GsonBuilder();
+    // unclear whether concurrent use is possible
+    private final Gson gson = builder.create();
+
+    private final BufferedReader incoming;
+    private final Writer outgoing;
+    private final Thread threadListener;
+
+    private ReentrantLock lockSend = new ReentrantLock();
+
+    private final ConcurrentHashMap<String, Object> waiting = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, Object> responses = new ConcurrentHashMap<>();
+
+    private AtomicInteger idCounter = new AtomicInteger();
+
+    public Consumer<Object> allEventHandler = (o) -> {
+    };
+
+    public RPCLayer(Reader incoming, Writer outgoing) {
+        this.incoming = new BufferedReader(incoming);
+        this.outgoing = outgoing;
+        threadListener = new Thread(this::listenForEvents);
+        threadListener.start();
+    }
+
+    public static RPCLayer startWithCLI(String jarFile) throws IOException {
+        var pbuilder = new ProcessBuilder("java", "-jar", jarFile);
+        var p = pbuilder.start();
+        var incoming = new InputStreamReader(p.getInputStream());
+        var outgoing = new OutputStreamWriter(p.getOutputStream());
+        return new RPCLayer(incoming, outgoing);
+    }
+
+    private void listenForEvents() {
+        char[] buf = new char[4 * 1024];
+        try {
+            while (true) {
+                String length = incoming.readLine();
+                if (length == null) {
+                    break; // connection closed
+                }
+
+                if (!length.startsWith("Content-Length: ")) {
+                    break;//communication mismatch
+                }
+
+                int len = Integer.parseInt(length.substring(17));
+
+                if (buf.length <= len + 2) {//also read \r\n,
+                    buf = new char[len + 2]; //reallocate more
+                }
+
+                int count = incoming.read(buf);
+                assert count == buf.length;
+
+                var message = new String(buf, 0, count);
+                processIncomingMessage(message);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void processIncomingMessage(String message) {
+        var simpleMap = gson.fromJson(message, Map.class);
+    }
+
+    public Object waitForResponse(String id) throws InterruptedException {
+        var cond = waiting.get(id);
+        cond.wait();
+        return responses.get(id);
+    }
+
+    public Object callSync(String methodName, Object... args) throws InterruptedException, IOException {
+        var id = nextId();
+        waiting.put(id, new Object());
+        sendAsync(id, methodName, args);
+        return waitForResponse(id);
+    }
+
+    public void callAsync(String methodName, Object... args) throws IOException {
+        var id = nextId();
+        sendAsync(id, methodName, args);
+    }
+
+    private String nextId() {
+        return "" + idCounter.getAndIncrement();
+    }
+
+    private void sendAsync(String id, String methodName, Object[] args) throws IOException {
+        try {
+            lockSend.lock();
+            var map = Map.of("id", id, "method", methodName, "args", args);
+            var json = gson.toJson(map);
+            outgoing.write("Content-Length: %d\r\n".formatted(json.length()));
+            outgoing.write(json);
+            outgoing.write("\r\n");
+            outgoing.flush();
+        } finally {
+            lockSend.unlock();
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
new file mode 100644
index 00000000000..30050fd6b85
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
@@ -0,0 +1,8 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public record TreeNodeId() {
+}
diff --git a/keyext.client.java/src/main/resources/edu/kit/iti/formal/keyextclientjava/hello-view.fxml b/keyext.client.java/src/main/resources/edu/kit/iti/formal/keyextclientjava/hello-view.fxml
new file mode 100644
index 00000000000..982318240d9
--- /dev/null
+++ b/keyext.client.java/src/main/resources/edu/kit/iti/formal/keyextclientjava/hello-view.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.Button?>
+<VBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml"
+      fx:controller="edu.kit.iti.formal.keyextclientjava.HelloController">
+  <padding>
+    <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+  </padding>
+
+  <Label fx:id="welcomeText"/>
+  <Button text="Hello!" onAction="#onHelloButtonClick"/>
+</VBox>
diff --git a/settings.gradle b/settings.gradle
index 7f69b30e975..bc86488f1ac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,9 +14,13 @@ include 'keyext.ui.testgen'
 include 'keyext.proofmanagement'
 include 'keyext.exploration'
 include 'keyext.slicing'
+include 'keyext.caching'
+
 include 'keyext.api'
 include 'keyext.api.doc'
-include 'keyext.caching'
+include 'keyext.client.java'
+
+
 
 // ENABLE NULLNESS here or on the CLI
 // This flag is activated to enable the checker framework.

From c89ca48610fe8b8164b590ce6460d69e5cea06d7 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 24 Nov 2024 20:45:09 +0100
Subject: [PATCH 23/50] java variant

---
 keyext.api/build.gradle                       |   1 +
 .../keyextclientjava/HelloApplication.java    |  11 +-
 .../iti/formal/keyextclientjava/JsonRPC.java  | 100 +++++++++
 .../formal/keyextclientjava/KeyRemote.java    |   9 +-
 .../formal/keyextclientjava/MyKeyClient.java  |  12 +-
 .../iti/formal/keyextclientjava/RPCLayer.java | 212 +++++++++++++-----
 .../formal/keyextclientjava/TreeNodeId.java   |   8 -
 .../edu/kit/keyext/client/RPCLayerTest.java   |  53 +++++
 .../java/edu/kit/keyext/client/Starter.java   |  22 ++
 9 files changed, 347 insertions(+), 81 deletions(-)
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java
 delete mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
 create mode 100644 keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
 create mode 100644 keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java

diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 71e79884c3d..9ae84c89b22 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -8,6 +8,7 @@ plugins {
 }
 
 description "Verification server interface via JSON-RPC"
+mainClassName ="org.keyproject.key.api.StartServer"
 
 dependencies {
     api(project(":key.core"))
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
index b2b739c9baa..87b1618cd70 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
@@ -1,11 +1,17 @@
 package edu.kit.iti.formal.keyextclientjava;
 
 import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
+import javafx.geometry.Orientation;
 import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.stage.FileChooser;
 import javafx.stage.Stage;
+import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
+import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.io.IOException;
+import java.util.concurrent.ForkJoinPool;
 
 public class HelloApplication extends Application {
     @Override
@@ -19,4 +25,5 @@ public void start(Stage stage) throws IOException {
     public static void main(String[] args) {
         launch();
     }
-}
\ No newline at end of file
+}
+
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java
new file mode 100644
index 00000000000..4593172b584
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java
@@ -0,0 +1,100 @@
+package edu.kit.iti.formal.keyextclientjava;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.11.24)
+ */
+public class JsonRPC {
+    public static final String CONTENT_LENGTH = "Content-Length:";
+    private static final Gson gson = new Gson();
+
+    public static String createNotification(String method, Object... args) {
+        return createRequest(null, method, args);
+    }
+
+    public static String createRequest(@Nullable String id, String method, Object... args) {
+        JsonArray params = gson.toJsonTree(args).getAsJsonArray();
+        return createRequest(id, method, params);
+    }
+
+    public static String createRequest(@Nullable String id, String method, JsonArray params) {
+        var jsonObject = new JsonObject();
+        jsonObject.addProperty("jsonrpc", "2.0");
+        if (id != null) {
+            jsonObject.addProperty("id", id);
+        }
+
+        jsonObject.addProperty("method", method);
+        jsonObject.add("params", params);
+
+        return jsonObject.toString();
+    }
+
+    public static String createResponse(String id, Object result) {
+        return createResponse(id, gson.toJsonTree(result), null);
+    }
+
+    public static String createErrorReponse(String id, int code, String message, @Nullable Object data) {
+        return createResponse(id, null, createError(code, message, data));
+    }
+
+    public static String createResponse(String id, @Nullable JsonElement result, @Nullable JsonObject error) {
+        if (result != null && error != null) {
+            throw new IllegalArgumentException("result and error at the same time is invalid");
+        }
+
+        if (!(result != null || error != null)) {
+            throw new IllegalArgumentException("at least one of result and error must be not null");
+        }
+
+        var jsonObject = new JsonObject();
+        jsonObject.addProperty("jsonrpc", "2.0");
+        jsonObject.addProperty("id", id);
+
+        if (result != null) {
+            jsonObject.add("result", result);
+        }
+        if (error != null) {
+            jsonObject.add("error", error);
+        }
+
+        return jsonObject.toString();
+    }
+
+    /**
+     * 5.1 Error object
+     * When a rpc call encounters an error, the Response Object MUST contain the error member with a value that is a Object with the following members:
+     * <p>
+     * code
+     * A Number that indicates the error type that occurred.
+     * This MUST be an integer.
+     * message
+     * A String providing a short description of the error.
+     * The message SHOULD be limited to a concise single sentence.
+     * data
+     * A Primitive or Structured value that contains additional information about the error.
+     * This may be omitted.
+     * The value of this member is defined by the Server (e.g. detailed error information, nested errors etc.).
+     *
+     * @return
+     */
+    public static JsonObject createError(int code, String message, @Nullable Object data) {
+        var jsonObject = new JsonObject();
+        jsonObject.addProperty("code", code);
+        jsonObject.addProperty("message", message);
+        if (data != null) {
+            jsonObject.add("data", gson.toJsonTree(data));
+        }
+        return jsonObject;
+    }
+
+    public static String addHeader(String response) {
+        return "%s %d\r\n%s\r\n".formatted(CONTENT_LENGTH, response.length(), response);
+    }
+}
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
index fa6cb27c097..1e7ed92536b 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
@@ -5,6 +5,13 @@
  * @version 1 (22.11.24)
  */
 public class KeyRemote {
+    private final RPCLayer layer;
+
     public KeyRemote(RPCLayer rpcLayer) {
+        this.layer = rpcLayer;
+    }
+
+    public String meta_version() {
+        return layer.callSync("meta/version").getAsString();
     }
-}
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 12fd1aa6bed..579c105e175 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -4,25 +4,18 @@
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.FileChooser;
-import org.controlsfx.glyphfont.FontAwesome;
-import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;
 
-import javax.swing.*;
 import java.io.IOException;
 import java.util.concurrent.ForkJoinPool;
 
-/**
- * @author Alexander Weigl
- * @version 1 (22.11.24)
- */
 public class MyKeyClient {
-    private static final String JAR_FILE = "";
+    public static final String JAR_FILE = "";
     private final ToolBar toolbar = new ToolBar();
     private final Label txtStatus = new Label("Yeah!");
     public final BorderPane root = new BorderPane();
-    private final TreeView<TreeNodeId> tnid = new TreeView<>();
+    private final TreeView<Object> tnid = new TreeView<>();
     private final TextArea txtSequentView = new TextArea();
 
     private final FileChooser fc = new FileChooser();
@@ -45,7 +38,6 @@ public MyKeyClient() {
 
     private Object startKey() throws IOException {
         return new KeyRemote(RPCLayer.startWithCLI(JAR_FILE));
-
     }
 
     private void openFile() {
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
index 70eabaefe79..b1fd5a63cf6 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
@@ -2,13 +2,15 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.jspecify.annotations.Nullable;
 
 import java.io.*;
-import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Consumer;
 
 /**
  * @author Alexander Weigl
@@ -21,23 +23,20 @@ public final class RPCLayer {
 
     private final BufferedReader incoming;
     private final Writer outgoing;
-    private final Thread threadListener;
 
-    private ReentrantLock lockSend = new ReentrantLock();
+    private @Nullable Thread threadListener;
+    private @Nullable Thread threadMessageHandling;
 
     private final ConcurrentHashMap<String, Object> waiting = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<String, Object> responses = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, JsonObject> responses = new ConcurrentHashMap<>();
+    public final ArrayBlockingQueue<JsonObject> incomingMessages = new ArrayBlockingQueue<>(16);
 
-    private AtomicInteger idCounter = new AtomicInteger();
+    private final AtomicInteger idCounter = new AtomicInteger();
 
-    public Consumer<Object> allEventHandler = (o) -> {
-    };
 
     public RPCLayer(Reader incoming, Writer outgoing) {
         this.incoming = new BufferedReader(incoming);
         this.outgoing = outgoing;
-        threadListener = new Thread(this::listenForEvents);
-        threadListener.start();
     }
 
     public static RPCLayer startWithCLI(String jarFile) throws IOException {
@@ -48,51 +47,34 @@ public static RPCLayer startWithCLI(String jarFile) throws IOException {
         return new RPCLayer(incoming, outgoing);
     }
 
-    private void listenForEvents() {
-        char[] buf = new char[4 * 1024];
-        try {
-            while (true) {
-                String length = incoming.readLine();
-                if (length == null) {
-                    break; // connection closed
-                }
-
-                if (!length.startsWith("Content-Length: ")) {
-                    break;//communication mismatch
-                }
-
-                int len = Integer.parseInt(length.substring(17));
-
-                if (buf.length <= len + 2) {//also read \r\n,
-                    buf = new char[len + 2]; //reallocate more
-                }
-
-                int count = incoming.read(buf);
-                assert count == buf.length;
-
-                var message = new String(buf, 0, count);
-                processIncomingMessage(message);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void processIncomingMessage(String message) {
-        var simpleMap = gson.fromJson(message, Map.class);
-    }
-
-    public Object waitForResponse(String id) throws InterruptedException {
+    public JsonObject waitForResponse(String id) throws InterruptedException {
         var cond = waiting.get(id);
-        cond.wait();
-        return responses.get(id);
+        synchronized (cond) {
+            cond.wait();
+        }
+        var r = responses.get(id);
+        waiting.remove(id);
+        responses.remove(id);
+        return r;
     }
 
-    public Object callSync(String methodName, Object... args) throws InterruptedException, IOException {
+    public JsonObject callSync(String methodName, Object... args) {
         var id = nextId();
         waiting.put(id, new Object());
-        sendAsync(id, methodName, args);
-        return waitForResponse(id);
+        try {
+            sendAsync(id, methodName, args);
+            var response = waitForResponse(id);
+            return handleError(response);
+        } catch (InterruptedException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private JsonObject handleError(JsonObject response) {
+        if (response.get("error") != null) {
+            throw new RuntimeException("Request did not succeed " + response.get("error"));
+        }
+        return response;
     }
 
     public void callAsync(String methodName, Object... args) throws IOException {
@@ -105,16 +87,126 @@ private String nextId() {
     }
 
     private void sendAsync(String id, String methodName, Object[] args) throws IOException {
+        var json = JsonRPC.createRequest(id, methodName, args);
+        outgoing.write(JsonRPC.addHeader(json));
+        outgoing.flush();
+    }
+
+    public void start() {
+        threadListener = new Thread(new JsonStreamListener(incoming, incomingMessages));
+        threadMessageHandling = new Thread(this::handler);
+        threadListener.start();
+        threadMessageHandling.start();
+    }
+
+    private void handler() {
         try {
-            lockSend.lock();
-            var map = Map.of("id", id, "method", methodName, "args", args);
-            var json = gson.toJson(map);
-            outgoing.write("Content-Length: %d\r\n".formatted(json.length()));
-            outgoing.write(json);
-            outgoing.write("\r\n");
-            outgoing.flush();
-        } finally {
-            lockSend.unlock();
+            while (true) {
+                var obj = incomingMessages.poll(1, TimeUnit.MINUTES);
+                if (obj == null) {
+                    continue;
+                }
+                if (obj.get("id") != null) {
+                    var id = obj.get("id").getAsString();
+                    responses.put(id, obj); // store response
+                    var syncObj = waiting.get(id);
+
+                    synchronized (syncObj) {
+                        syncObj.notifyAll();
+                    }
+                } else {
+                    //TODO handle notification
+                    System.out.println("Notification received");
+                    System.out.println(obj);
+                }
+            }
+        } catch (InterruptedException ignored) {
+        }
+    }
+
+    public void dispose() {
+        if (threadListener != null) {
+            threadListener.interrupt();
+        }
+    }
+
+    public static class JsonStreamListener implements Runnable {
+        private final char[] CLENGTH = (JsonRPC.CONTENT_LENGTH + " ").toCharArray();
+        private final Reader incoming;
+        private final ArrayBlockingQueue<JsonObject> incomingMessageQueue;
+        /**
+         * Internal buffer for reading efficient.
+         */
+        private char[] buf = new char[4 * 1024];
+
+        public JsonStreamListener(Reader incoming, ArrayBlockingQueue<JsonObject> queue) {
+            this.incoming = new BufferedReader(incoming); // ensure bufferness
+            this.incomingMessageQueue = queue;
+        }
+
+        @Override
+        public void run() {
+            try {
+                while (true) {
+                    final var message = readMessage();
+                    if (message == null) break;
+                    final var jsonObject = JsonParser.parseString(message).getAsJsonObject();
+                    incomingMessageQueue.add(jsonObject);
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        protected void processIncomingMessage(String message) {
+
+        }
+
+
+        public @Nullable String readMessage() throws IOException {
+            expectedContentLength();
+            final var len = readLength() + 2; //also read \r\n,
+
+            if (len == 2) {// EOF reached
+                return null;
+            }
+
+            if (buf.length <= len) { //reallocate more if necessary
+                buf = new char[len];
+            }
+
+            int count = incoming.read(buf, 0, len);
+            assert count == len;
+            return new String(buf, 0, count).trim();
+        }
+
+        private int readLength() throws IOException {
+            int c;
+            int len = 0;
+            do {
+                c = incoming.read();
+                //if (Character.isWhitespace(c)) continue;
+                if (c == -1) return 0;
+                if (c == '\r' || c == '\n') break;
+                if (Character.isDigit(c)) {
+                    len = len * 10 + c - '0';
+                } else {
+                    throw new IllegalStateException("Expected: a digit, but got '%c'".formatted(c));
+                }
+            } while (c != -1);
+            c = incoming.read(); // consume the '\n'
+            assert c == '\n';
+            return len;
+        }
+
+        private void expectedContentLength() throws IOException {
+            for (var e : CLENGTH) {
+                int c = incoming.read();
+                if (c == -1) return;
+                if (e != c) {
+                    throw new IllegalStateException("Expected: '%c', but got '%c'".formatted(e, c));
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
deleted file mode 100644
index 30050fd6b85..00000000000
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.kit.iti.formal.keyextclientjava;
-
-/**
- * @author Alexander Weigl
- * @version 1 (22.11.24)
- */
-public record TreeNodeId() {
-}
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
new file mode 100644
index 00000000000..0563f007f7b
--- /dev/null
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
@@ -0,0 +1,53 @@
+package edu.kit.keyext.client;
+
+import edu.kit.iti.formal.keyextclientjava.JsonRPC;
+import edu.kit.iti.formal.keyextclientjava.RPCLayer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.concurrent.ArrayBlockingQueue;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.11.24)
+ */
+public class RPCLayerTest {
+    @Test
+    void testSending() throws IOException {
+        var incoming = new StringReader("");
+        var outgoing = new StringWriter();
+        RPCLayer layer = new RPCLayer(incoming, outgoing);
+        layer.callAsync("doSomething", 1, 1);
+
+        var request = JsonRPC.createRequest("0", "doSomething", 1, 1);
+        var requestWH = JsonRPC.addHeader(request);
+        Assertions.assertEquals(requestWH, outgoing.toString());
+    }
+
+    @Test
+    void testIncoming() throws IOException {
+        var notification = JsonRPC.createNotification("test", 1, 2, 3, 4);
+        var response = JsonRPC.createResponse("1", 2);
+        final var incoming = new StringReader(JsonRPC.addHeader(notification) +
+                JsonRPC.addHeader(response));
+        RPCLayer.JsonStreamListener listener = new RPCLayer.JsonStreamListener(incoming, new ArrayBlockingQueue<>(1));
+        String first = listener.readMessage();
+        Assertions.assertEquals(notification, first);
+        String second = listener.readMessage();
+        Assertions.assertEquals(response, second);
+    }
+
+
+
+    @Test
+    void testLockingAndReleasing() throws IOException, InterruptedException {
+        var response = JsonRPC.addHeader(JsonRPC.createResponse("0", 2));
+        var layer = new RPCLayer(new StringReader(response), new StringWriter());
+        layer.start(); // starts the thread.
+        var result = layer.callSync("calc", 1, 1);
+        System.out.println(result);
+    }
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
new file mode 100644
index 00000000000..40492fd4aeb
--- /dev/null
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
@@ -0,0 +1,22 @@
+package edu.kit.keyext.client;
+
+import edu.kit.iti.formal.keyextclientjava.KeyRemote;
+import edu.kit.iti.formal.keyextclientjava.RPCLayer;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static edu.kit.iti.formal.keyextclientjava.MyKeyClient.JAR_FILE;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.11.24)
+ */
+public class Starter {
+    @Test
+    void test() throws IOException {
+        var file = "/home/weigl/work/key/keyext.api/build/libs/keyext.api-2.12.4-dev-all.jar";
+        var remote = new KeyRemote(RPCLayer.startWithCLI(file));
+        System.out.println(remote.meta_version());
+    }
+}

From 1fe76bbd0800dadccb19126f37c24153eed4afb2 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Tue, 3 Dec 2024 23:31:41 +0100
Subject: [PATCH 24/50] writing on a java client

---
 keyext.api/src/main/resources/logback.xml     |  59 +++++++++
 keyext.client.java/build.gradle               |   8 +-
 .../formal/keyextclientjava/MyKeyClient.java  | 122 +++++++++++++++++-
 .../keyextclientjava/{ => rpc}/JsonRPC.java   |   4 +-
 .../keyextclientjava/{ => rpc}/KeyRemote.java |   7 +-
 .../keyextclientjava/{ => rpc}/RPCLayer.java  |  75 +++++++----
 .../edu/kit/keyext/client/RPCLayerTest.java   |   4 +-
 .../java/edu/kit/keyext/client/Starter.java   |  10 +-
 8 files changed, 249 insertions(+), 40 deletions(-)
 create mode 100644 keyext.api/src/main/resources/logback.xml
 rename keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/{ => rpc}/JsonRPC.java (95%)
 rename keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/{ => rpc}/KeyRemote.java (56%)
 rename keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/{ => rpc}/RPCLayer.java (80%)

diff --git a/keyext.api/src/main/resources/logback.xml b/keyext.api/src/main/resources/logback.xml
new file mode 100644
index 00000000000..4957bda9dc6
--- /dev/null
+++ b/keyext.api/src/main/resources/logback.xml
@@ -0,0 +1,59 @@
+<!-- this configuration avoids log message on stdout -->
+<configuration>
+    <!-- disables logback configuration messages on start up, see #1725 -->
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
+    <timestamp key="timestamp" datePattern="yyyyMMdd'T'HHmmss"/>
+
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>${user.home}/.key/logs/key_${timestamp}.log</file>
+        <append>false</append>
+        <encoder>
+            <charset>UTF-8</charset>
+            <!-- replace newlines by \n to allow line-based filtering (see LogView) -->
+            <pattern>%date|%level|%thread|%logger|%file:%line|%replace(%msg){'[\n\r]','\\n'}|%replace(%ex){'[\n\r]','\\n'}%nopex|%n</pattern>
+            <outputPatternAsHeader>true</outputPatternAsHeader>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%date{HH:mm:ss.SSS}] %highlight(%-5level) %cyan(%logger{0}) - %msg%ex%n</pattern>
+        </encoder>
+        <!--
+            The threshold of this filter is also selected by the command line option "verbose <int>" where
+                SILENT = 0 (completely off)
+                NORMAL = 1
+                INFO = 2
+                DEBUG = 3
+                TRACE = 4
+        -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDERR"/>
+        <!-- <appender-ref ref="FILE"/> -->
+    </root>
+
+    <!--
+        A logger for development, also print to CONSOLE. This logger is not restricted by any command line options.
+        You should not use this code on the master branch.
+    -->
+    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.err</target>
+        <encoder>
+            <pattern>[%relative] %highlight(%-5level) %cyan(%logger{0}): %msg %n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>TRACE</level>
+        </filter>
+    </appender>
+
+    <logger name="key.devel" level="DEBUG">
+        <appender-ref ref="STDERR"/>
+    </logger>
+
+</configuration>
diff --git a/keyext.client.java/build.gradle b/keyext.client.java/build.gradle
index 430cc898bd2..c9e7ce1109f 100644
--- a/keyext.client.java/build.gradle
+++ b/keyext.client.java/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'application'
     id 'org.javamodularity.moduleplugin' version '1.8.12'
-    id 'org.openjfx.javafxplugin' version '0.0.13'
+    id 'org.openjfx.javafxplugin' version '0.1.0'
 }
 
 repositories {
@@ -18,11 +18,13 @@ application {
 }
 
 javafx {
-    version = '21.0.5'
-    modules = ['javafx.controls', 'javafx.fxml']
+    version = "23.0.1"
+    modules = [ 'javafx.controls' ]
 }
 
 dependencies {
+    implementation project(":keyext.api")
+
     implementation('org.controlsfx:controlsfx:11.2.1')
     implementation('org.kordamp.ikonli:ikonli-javafx:12.3.1')
     implementation('org.kordamp.ikonli:ikonli-fontawesome5-pack:12.3.1')
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 579c105e175..4ff905312cb 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -1,14 +1,35 @@
 package edu.kit.iti.formal.keyextclientjava;
 
+import de.uka.ilkd.key.proof.io.ProblemLoaderException;
+import de.uka.ilkd.key.prover.TaskFinishedInfo;
+import de.uka.ilkd.key.prover.TaskStartedInfo;
+import edu.kit.iti.formal.keyextclientjava.rpc.KeyRemote;
+import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
 import javafx.geometry.Orientation;
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.FileChooser;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.keyproject.key.api.KeyApiImpl;
+import org.keyproject.key.api.StartServer;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.LoadParams;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.remoteclient.*;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.io.IOException;
-import java.util.concurrent.ForkJoinPool;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class MyKeyClient {
     public static final String JAR_FILE = "";
@@ -19,8 +40,10 @@ public class MyKeyClient {
     private final TextArea txtSequentView = new TextArea();
 
     private final FileChooser fc = new FileChooser();
+    private final KeyApi keyApi;
+    private KeyIdentifications.ProofId loadedProof;
 
-    public MyKeyClient() {
+    public MyKeyClient() throws IOException {
         //region toolbar
         var btnOpen = new Button("Open", new FontIcon(FontAwesomeRegular.FOLDER_OPEN));
         btnOpen.setOnAction(actionEvent -> openFile());
@@ -33,7 +56,37 @@ public MyKeyClient() {
         root.setCenter(splitCenter);
         root.setBottom(txtStatus);
 
-        var startKey = ForkJoinPool.commonPool().submit(this::startKey);
+        //var startKey = ForkJoinPool.commonPool().submit(this::startKey);
+
+        PipedInputStream inClient = new PipedInputStream();
+        PipedOutputStream outClient = new PipedOutputStream();
+        PipedInputStream inServer = new PipedInputStream();
+        PipedOutputStream outServer = new PipedOutputStream();
+
+        inClient.connect(outServer);
+        outClient.connect(inServer);
+
+        KeyApiImpl impl = new KeyApiImpl();
+        Launcher<ClientApi> serverLauncher = StartServer.launch(outServer, inServer, impl);
+        impl.setClientApi(serverLauncher.getRemoteProxy());
+
+        var client = new SimpleClient();
+        Launcher<KeyApi> clientLauncher = new Launcher.Builder<KeyApi>()
+                .setLocalService(client)
+                .setRemoteInterfaces(Collections.singleton(KeyApi.class))
+                .setInput(inClient)
+                .setOutput(outClient)
+                .configureGson(StartServer::configureJson)
+                .traceMessages(new PrintWriter(System.err))
+                .create();
+
+        Logger logger = Logger.getLogger(StreamMessageProducer.class.getName());
+        logger.setLevel(Level.SEVERE);
+
+        clientLauncher.startListening();
+        serverLauncher.startListening();
+
+        this.keyApi = clientLauncher.getRemoteProxy();
     }
 
     private Object startKey() throws IOException {
@@ -41,6 +94,67 @@ private Object startKey() throws IOException {
     }
 
     private void openFile() {
-        fc.showOpenDialog(null);
+        var sel = fc.showOpenDialog(null);
+        if (sel != null) {
+            try {
+                loadedProof = keyApi.load(new LoadParams(sel, null, null, null, null))
+                        .get().getRight();
+                var root = keyApi.root(loadedProof).get();
+                var sequent
+                        = keyApi.print(root.nodeid(), new PrintOptions(true, 80, 4, true, false))
+                        .get();
+                txtSequentView.setText(sequent.result());
+            } catch (ProblemLoaderException e) {
+                throw new RuntimeException(e);
+            } catch (ExecutionException e) {
+                throw new RuntimeException(e);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+
+        }
+    }
+
+    private class SimpleClient implements ClientApi{
+        @Override
+        public void sayHello(String e) {
+
+        }
+
+        @Override
+        public void logTrace(LogTraceParams params) {
+
+        }
+
+        @Override
+        public void showMessage(ShowMessageParams params) {
+
+        }
+
+        @Override
+        public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+            return null;
+        }
+
+        @Override
+        public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params) {
+            return null;
+        }
+
+        @Override
+        public void taskFinished(TaskFinishedInfo info) {
+
+        }
+
+        @Override
+        public void taskProgress(int position) {
+
+        }
+
+        @Override
+        public void taskStarted(TaskStartedInfo info) {
+
+        }
     }
 }
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
similarity index 95%
rename from keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java
rename to keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
index 4593172b584..820236976b4 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/JsonRPC.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
@@ -1,4 +1,4 @@
-package edu.kit.iti.formal.keyextclientjava;
+package edu.kit.iti.formal.keyextclientjava.rpc;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -95,6 +95,6 @@ public static JsonObject createError(int code, String message, @Nullable Object
     }
 
     public static String addHeader(String response) {
-        return "%s %d\r\n%s\r\n".formatted(CONTENT_LENGTH, response.length(), response);
+        return "%s %d\r\n\r\n%s\r\n".formatted(CONTENT_LENGTH, response.length(), response);
     }
 }
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
similarity index 56%
rename from keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
rename to keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
index 1e7ed92536b..966f7747cff 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/KeyRemote.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
@@ -1,4 +1,6 @@
-package edu.kit.iti.formal.keyextclientjava;
+package edu.kit.iti.formal.keyextclientjava.rpc;
+
+import com.google.gson.JsonObject;
 
 /**
  * @author Alexander Weigl
@@ -12,6 +14,7 @@ public KeyRemote(RPCLayer rpcLayer) {
     }
 
     public String meta_version() {
-        return layer.callSync("meta/version").getAsString();
+        final var obj = layer.callSync("meta/version");
+        return obj.get("result").getAsString();
     }
 }
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
similarity index 80%
rename from keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
rename to keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
index b1fd5a63cf6..598342b5ea3 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/RPCLayer.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
@@ -1,4 +1,4 @@
-package edu.kit.iti.formal.keyextclientjava;
+package edu.kit.iti.formal.keyextclientjava.rpc;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -7,9 +7,7 @@
 import org.jspecify.annotations.Nullable;
 
 import java.io.*;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -27,8 +25,7 @@ public final class RPCLayer {
     private @Nullable Thread threadListener;
     private @Nullable Thread threadMessageHandling;
 
-    private final ConcurrentHashMap<String, Object> waiting = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<String, JsonObject> responses = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, SimpleFuture> waiting = new ConcurrentHashMap<>();
     public final ArrayBlockingQueue<JsonObject> incomingMessages = new ArrayBlockingQueue<>(16);
 
     private final AtomicInteger idCounter = new AtomicInteger();
@@ -47,25 +44,21 @@ public static RPCLayer startWithCLI(String jarFile) throws IOException {
         return new RPCLayer(incoming, outgoing);
     }
 
-    public JsonObject waitForResponse(String id) throws InterruptedException {
+    public JsonObject waitForResponse(String id) throws InterruptedException, ExecutionException {
         var cond = waiting.get(id);
-        synchronized (cond) {
-            cond.wait();
-        }
-        var r = responses.get(id);
+        var r = cond.get();
         waiting.remove(id);
-        responses.remove(id);
         return r;
     }
 
     public JsonObject callSync(String methodName, Object... args) {
         var id = nextId();
-        waiting.put(id, new Object());
+        waiting.put(id, new SimpleFuture());
         try {
             sendAsync(id, methodName, args);
             var response = waitForResponse(id);
             return handleError(response);
-        } catch (InterruptedException | IOException e) {
+        } catch (InterruptedException | IOException | ExecutionException e) {
             throw new RuntimeException(e);
         }
     }
@@ -88,13 +81,14 @@ private String nextId() {
 
     private void sendAsync(String id, String methodName, Object[] args) throws IOException {
         var json = JsonRPC.createRequest(id, methodName, args);
-        outgoing.write(JsonRPC.addHeader(json));
+        final var str = JsonRPC.addHeader(json);
+        outgoing.write(str);
         outgoing.flush();
     }
 
     public void start() {
-        threadListener = new Thread(new JsonStreamListener(incoming, incomingMessages));
-        threadMessageHandling = new Thread(this::handler);
+        threadListener = new Thread(new JsonStreamListener(incoming, incomingMessages), "JSON Message Reader");
+        threadMessageHandling = new Thread(this::handler, "JSON Message Handler");
         threadListener.start();
         threadMessageHandling.start();
     }
@@ -108,12 +102,8 @@ private void handler() {
                 }
                 if (obj.get("id") != null) {
                     var id = obj.get("id").getAsString();
-                    responses.put(id, obj); // store response
                     var syncObj = waiting.get(id);
-
-                    synchronized (syncObj) {
-                        syncObj.notifyAll();
-                    }
+                    syncObj.put(obj);
                 } else {
                     //TODO handle notification
                     System.out.println("Notification received");
@@ -209,4 +199,45 @@ private void expectedContentLength() throws IOException {
             }
         }
     }
+}
+
+class SimpleFuture implements Future<JsonObject> {
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private JsonObject value;
+
+    @Override
+    public boolean cancel(boolean mayInterruptIfRunning) {
+        return false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDone() {
+        return value != null;
+    }
+
+    @Override
+    public JsonObject get() throws InterruptedException, ExecutionException {
+        latch.await();
+        return value;
+    }
+
+    @Override
+    public JsonObject get(long timeout, TimeUnit unit) throws InterruptedException, TimeoutException {
+        if (latch.await(timeout, unit)) {
+            return value;
+        } else {
+            throw new TimeoutException();
+        }
+    }
+
+    void put(JsonObject value) {
+        this.value = value;
+        latch.countDown();
+    }
+
 }
\ No newline at end of file
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
index 0563f007f7b..f6195ae8a8f 100644
--- a/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
@@ -1,7 +1,7 @@
 package edu.kit.keyext.client;
 
-import edu.kit.iti.formal.keyextclientjava.JsonRPC;
-import edu.kit.iti.formal.keyextclientjava.RPCLayer;
+import edu.kit.iti.formal.keyextclientjava.rpc.JsonRPC;
+import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
index 40492fd4aeb..491e20309b7 100644
--- a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
@@ -1,13 +1,11 @@
 package edu.kit.keyext.client;
 
-import edu.kit.iti.formal.keyextclientjava.KeyRemote;
-import edu.kit.iti.formal.keyextclientjava.RPCLayer;
+import edu.kit.iti.formal.keyextclientjava.rpc.KeyRemote;
+import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import static edu.kit.iti.formal.keyextclientjava.MyKeyClient.JAR_FILE;
-
 /**
  * @author Alexander Weigl
  * @version 1 (24.11.24)
@@ -16,7 +14,9 @@ public class Starter {
     @Test
     void test() throws IOException {
         var file = "/home/weigl/work/key/keyext.api/build/libs/keyext.api-2.12.4-dev-all.jar";
-        var remote = new KeyRemote(RPCLayer.startWithCLI(file));
+        final var rpcLayer = RPCLayer.startWithCLI(file);
+        rpcLayer.start();
+        var remote = new KeyRemote(rpcLayer);
         System.out.println(remote.meta_version());
     }
 }

From c3cac62e6e58a452c53eb5739c06d2465fbadcb1 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 25 Jan 2025 21:54:26 +0100
Subject: [PATCH 25/50] fix merge

---
 gradle/wrapper/gradle-wrapper.properties                       | 2 +-
 .../src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48c0a02ca41..d6e308a6378 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index d4d25646294..0315df3a20b 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
@@ -9,6 +9,8 @@
 
 import de.uka.ilkd.key.java.JavaInfo;
 import de.uka.ilkd.key.java.Services;
+import de.uka.ilkd.key.java.abstraction.KeYJavaType;
+import de.uka.ilkd.key.logic.op.IObserverFunction;
 import de.uka.ilkd.key.nparser.ProofScriptEntry;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.init.InitConfig;
@@ -24,6 +26,7 @@
 import de.uka.ilkd.key.util.KeYTypeUtil;
 
 import org.jspecify.annotations.Nullable;
+import org.key_project.util.collection.ImmutableSet;
 
 /**
  * Instances of this class are used to collect and access all relevant information for verification

From b668d164673cff5caa50b59ac9692e32ad1d7478 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 25 Jan 2025 22:36:15 +0100
Subject: [PATCH 26/50] fix serialization of java.io.File

---
 keyext.api/build.gradle                       |  6 ++---
 .../org/keyproject/key/api/StartServer.java   |  4 ++--
 .../key/api/adapters/KeyAdapter.java          |  2 +-
 keyext.client.java/build.gradle               |  4 ++--
 .../{HelloApplication.java => Main.java}      | 23 ++++++++++---------
 .../formal/keyextclientjava/MyKeyClient.java  |  3 ++-
 .../formal/keyextclientjava/rpc/RPCLayer.java | 19 ++++++++++-----
 .../java/edu/kit/keyext/client/Starter.java   |  2 +-
 8 files changed, 36 insertions(+), 27 deletions(-)
 rename keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/{HelloApplication.java => Main.java} (55%)

diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 9ae84c89b22..3cb0d2ecc45 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -14,9 +14,9 @@ dependencies {
     api(project(":key.core"))
     api(project(":key.ui"))
 
-    api("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.1")
-    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
-    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.21.1")
+    api("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.23.1")
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.23.1")
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.23.1")
     implementation("org.eclipse.jetty.websocket:websocket-javax-server:10.0.16")
     implementation("info.picocli:picocli:4.7.5")
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 53293b35680..4cc5b80d392 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -149,7 +149,7 @@ public void run() {
 
 
     public static void configureJson(GsonBuilder gsonBuilder) {
-        gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
+        //gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
         gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
     }
@@ -160,7 +160,7 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
         var launcherBuilder = new Launcher.Builder<ClientApi>()
                 .setOutput(out)
                 .setInput(in)
-                .traceMessages(new PrintWriter(System.err))
+                //.traceMessages(new PrintWriter(System.err))
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index bd423049595..a4f2b433aab 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -57,7 +57,7 @@ public JsonElement serialize(ProofMacro src, Type typeOfSrc,
     public static class FileTypeAdapter extends TypeAdapter<File> {
         @Override
         public void write(JsonWriter out, File value) throws IOException {
-            out.value(value.toString());
+            out.value(String.valueOf(value));
         }
 
         @Override
diff --git a/keyext.client.java/build.gradle b/keyext.client.java/build.gradle
index c9e7ce1109f..50d4e4fcbc2 100644
--- a/keyext.client.java/build.gradle
+++ b/keyext.client.java/build.gradle
@@ -14,11 +14,11 @@ tasks.withType(JavaCompile) {
 }
 
 application {
-    mainClass = 'edu.kit.iti.formal.keyextclientjava.HelloApplication'
+    mainClass = 'edu.kit.iti.formal.keyextclientjava.Main'
 }
 
 javafx {
-    version = "23.0.1"
+    version = "23.0.2"
     modules = [ 'javafx.controls' ]
 }
 
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
similarity index 55%
rename from keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
rename to keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
index 87b1618cd70..3ec4af718b7 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/HelloApplication.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
@@ -13,17 +13,18 @@
 import java.io.IOException;
 import java.util.concurrent.ForkJoinPool;
 
-public class HelloApplication extends Application {
-    @Override
-    public void start(Stage stage) throws IOException {
-        Scene scene = new Scene(new MyKeyClient().root, 320, 240);
-        stage.setTitle("KeY Demo");
-        stage.setScene(scene);
-        stage.show();
-    }
+public class Main {
+    public static class HelloApplication extends Application {
+        @Override
+        public void start(Stage stage) throws IOException {
+            Scene scene = new Scene(new MyKeyClient().root, 320, 240);
+            stage.setTitle("KeY Demo");
+            stage.setScene(scene);
+            stage.show();
+        }
 
+    }
     public static void main(String[] args) {
-        launch();
+        Application.launch(HelloApplication.class, args);
     }
-}
-
+}
\ No newline at end of file
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 4ff905312cb..669b1c371f7 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -97,7 +97,8 @@ private void openFile() {
         var sel = fc.showOpenDialog(null);
         if (sel != null) {
             try {
-                loadedProof = keyApi.load(new LoadParams(sel, null, null, null, null))
+                loadedProof = keyApi.load(
+                        new LoadParams(sel, null, null, null, null))
                         .get().getRight();
                 var root = keyApi.root(loadedProof).get();
                 var sequent
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
index 598342b5ea3..76d75509b1f 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
@@ -15,10 +15,6 @@
  * @version 1 (22.11.24)
  */
 public final class RPCLayer {
-    private final GsonBuilder builder = new GsonBuilder();
-    // unclear whether concurrent use is possible
-    private final Gson gson = builder.create();
-
     private final BufferedReader incoming;
     private final Writer outgoing;
 
@@ -122,7 +118,7 @@ public void dispose() {
 
     public static class JsonStreamListener implements Runnable {
         private final char[] CLENGTH = (JsonRPC.CONTENT_LENGTH + " ").toCharArray();
-        private final Reader incoming;
+        private final PushbackReader incoming;
         private final ArrayBlockingQueue<JsonObject> incomingMessageQueue;
         /**
          * Internal buffer for reading efficient.
@@ -130,7 +126,7 @@ public static class JsonStreamListener implements Runnable {
         private char[] buf = new char[4 * 1024];
 
         public JsonStreamListener(Reader incoming, ArrayBlockingQueue<JsonObject> queue) {
-            this.incoming = new BufferedReader(incoming); // ensure bufferness
+            this.incoming = new PushbackReader(new BufferedReader(incoming)); // ensure bufferness
             this.incomingMessageQueue = queue;
         }
 
@@ -167,6 +163,7 @@ protected void processIncomingMessage(String message) {
 
             int count = incoming.read(buf, 0, len);
             assert count == len;
+            consumeCRNL();
             return new String(buf, 0, count).trim();
         }
 
@@ -198,6 +195,16 @@ private void expectedContentLength() throws IOException {
                 }
             }
         }
+
+        private void consumeCRNL() throws IOException {
+            int c = incoming.read();
+            if (c == '\r') {
+                c = incoming.read();
+                assert c == '\n';
+            } else {
+                incoming.unread(c);
+            }
+        }
     }
 }
 
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
index 491e20309b7..9a606fe2e33 100644
--- a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
@@ -13,7 +13,7 @@
 public class Starter {
     @Test
     void test() throws IOException {
-        var file = "/home/weigl/work/key/keyext.api/build/libs/keyext.api-2.12.4-dev-all.jar";
+        var file = "../keyext.api/build/libs/keyext.api-2.12.4-dev-all.jar";
         final var rpcLayer = RPCLayer.startWithCLI(file);
         rpcLayer.start();
         var remote = new KeyRemote(rpcLayer);

From 997daee21dd4312d964249274c686ed264b0cbaa Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Wed, 19 Feb 2025 15:10:21 +0100
Subject: [PATCH 27/50] - Shutdown Callbacks - TreeNodeDesc - Some
 stabilization of features

---
 .../keyproject/key/api/GenericSerializer.java |  4 +-
 .../org/keyproject/key/api/KeyApiImpl.java    | 16 ++++-
 .../org/keyproject/key/api/StartServer.java   | 59 +++++++++++++++++--
 .../key/api/adapters/KeyAdapter.java          |  6 ++
 .../keyproject/key/api/data/ContractDesc.java |  2 +-
 .../key/api/data/KeyIdentifications.java      |  2 +-
 .../keyproject/key/api/data/LoadParams.java   |  2 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |  9 ++-
 .../key/api/remoteapi/ProofTreeApi.java       |  1 +
 .../key/api/remoteapi/ServerManagement.java   |  1 +
 10 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
index 9082242ee37..7fe73de010e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -14,7 +14,7 @@
  */
 public class GenericSerializer implements JsonSerializer<Object> /* , JsonDeserializer<Object> */ {
 
-    private static final String CLASS_PROPERTY_NAME = "$type";
+    private static final String CLASS_PROPERTY_NAME = "$class";
     private final Gson gson;
 
     public GenericSerializer() {
@@ -53,7 +53,7 @@ public JsonElement serialize(Object src, Type typeOfSrc,
             JsonSerializationContext context) {
         JsonElement retValue = gson.toJsonTree(src);
         if (retValue.isJsonObject()) {
-            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getName());
+            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getSimpleName());
         }
         return retValue;
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 44cb61cf8b5..965c99343aa 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -11,6 +11,7 @@
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
@@ -54,6 +55,8 @@
 public final class KeyApiImpl implements KeyApi {
     private final KeyIdentifications data = new KeyIdentifications();
 
+    private Function<Void, Boolean> exitHandler;
+
     private ClientApi clientApi;
     private final ProverTaskListener clientListener = new ProverTaskListener() {
         @Override
@@ -91,6 +94,11 @@ public CompletableFuture<Boolean> shutdown() {
 
     @Override
     public void exit() {
+        this.exitHandler.apply(null);
+    }
+
+    public void setExitHandler(Function<Void, Boolean> exitHandler) {
+        this.exitHandler = exitHandler;
     }
 
     @Override
@@ -255,7 +263,9 @@ public CompletableFuture<Statistics> statistics(ProofId proofId) {
 
     @Override
     public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
-        return null;
+        return CompletableFuture.completedFuture(
+                TreeNodeDesc.from(proof, data.find(proof).root())
+        );
     }
 
     @Override
@@ -302,7 +312,7 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
             var env = data.find(contractId.envId());
             var contracts = env.getAvailableContracts();
             var contract =
-                contracts.stream().filter(it -> it.id() == contractId.contractId()).findFirst();
+                contracts.stream().filter(it -> Objects.equals(it.getName(),contractId.contractId())).findFirst();
             if (contract.isPresent()) {
                 try {
                     var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
@@ -459,7 +469,7 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
             KeYEnvironment<?> env;
             try {
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                    params.keyFile(),
+                    params.problemFile(),
                     params.classPath(),
                     params.bootClassPath(),
                     params.includes(),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 4cc5b80d392..3f0fbe54c9a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -8,7 +8,10 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.function.Function;
 import javax.annotation.Nullable;
 
 import com.google.gson.GsonBuilder;
@@ -64,9 +67,18 @@ public static void main(String[] args) {
         new CommandLine(new StartServer()).execute(args);
     }
 
+    @Nullable
     private InputStream in;
+
+    @Nullable
     private OutputStream out;
 
+    @Nullable
+    private Socket socket;
+
+    @Nullable
+    private Future<Void> listenerFuture;
+
     private void establishStreams() throws IOException {
         in = System.in;
         out = System.out;
@@ -76,7 +88,7 @@ private void establishStreams() throws IOException {
         }
 
         if (clientPort != null) {
-            var socket = new Socket(InetAddress.getLocalHost(), clientPort);
+            socket = new Socket(InetAddress.getLocalHost(), clientPort);
             socket.setKeepAlive(true);
             socket.setTcpNoDelay(true);
             in = socket.getInputStream();
@@ -87,7 +99,7 @@ private void establishStreams() throws IOException {
         if (serverPort != null) {
             var server = new ServerSocket(serverPort);
             LOGGER.info("Waiting on port {}", serverPort);
-            var socket = server.accept();
+            socket = server.accept();
             LOGGER.info("Connection to client established: {}", socket.getRemoteSocketAddress());
             socket.setKeepAlive(true);
             socket.setTcpNoDelay(true);
@@ -96,7 +108,6 @@ private void establishStreams() throws IOException {
             return;
         }
 
-
         if (inFile != null) {
             in = new FileInputStream(inFile);
         }
@@ -110,6 +121,32 @@ private void establishStreams() throws IOException {
         }
     }
 
+    private boolean shutdownHandler() {
+        LOGGER.info("Shutting down...");
+        try {
+            LOGGER.info("Closing Listener");
+            if (listenerFuture != null) {
+                listenerFuture.cancel(true);
+            }
+            LOGGER.info("Closing In Stream");
+            if (in != null) {
+                in.close();
+            }
+            LOGGER.info("Closing Out Stream");
+            if (out != null) {
+                out.close();
+            }
+            LOGGER.info("Closing Socket");
+            if (socket != null) {
+                socket.close();
+            }
+        } catch (IOException e) {
+            LOGGER.error("Error while closing streams", e);
+            return false;
+        }
+        return true;
+    }
+
 
     @Override
     public void run() {
@@ -139,7 +176,19 @@ public void run() {
                     var listener = launch(lout, lin, keyApi);
                     LOGGER.info("JSON-RPC is listening for requests");
                     keyApi.setClientApi(listener.getRemoteProxy());
-                    listener.startListening().get();
+                    keyApi.setExitHandler(new Function<Void, Boolean>() {
+                        @Override
+                        public Boolean apply(Void unused) {
+                            return StartServer.this.shutdownHandler();
+                        }
+                    });
+                    //listener.startListening().get();
+                    listenerFuture = listener.startListening();
+                    try {
+                        listenerFuture.get();
+                    } catch (CancellationException e) {
+                        LOGGER.info("Listener was cancelled; shutting down...");
+                    }
                 }
             }
         } catch (IOException | InterruptedException | ExecutionException e) {
@@ -149,9 +198,9 @@ public void run() {
 
 
     public static void configureJson(GsonBuilder gsonBuilder) {
-        //gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
         gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
+        gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index a4f2b433aab..8b8ed4ee988 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 
+import com.google.gson.stream.JsonToken;
 import de.uka.ilkd.key.macros.ProofMacro;
 
 import org.key_project.logic.op.Function;
@@ -62,6 +63,11 @@ public void write(JsonWriter out, File value) throws IOException {
 
         @Override
         public File read(JsonReader in) throws IOException {
+            var tokenType = in.peek();
+            if (tokenType == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
             return new File(in.nextString());
         }
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index b6a363a6f6e..e3b38ae96df 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -13,7 +13,7 @@
 public record ContractDesc(KeyIdentifications.ContractId contractId, String name, String displayName,
                            String typeName, String htmlText, String plainText) {
     public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services, Contract it) {
-        return new ContractDesc(new KeyIdentifications.ContractId(envId, it.id()),
+        return new ContractDesc(new KeyIdentifications.ContractId(envId, it.getName()),
                 it.getName(), it.getDisplayName(), it.getTypeName(),
                 it.getHTMLText(services), it.getPlainText(services));
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 3f512c76fbd..ea7e5d2b8a6 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -102,7 +102,7 @@ public record EnvironmentId(String envId) {
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record ContractId(EnvironmentId envId, int contractId) {
+    public record ContractId(EnvironmentId envId, String contractId) {
     }
 
     /**
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 6d0a47c9a3f..8a337d62b65 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -14,4 +14,4 @@
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath, List<File> includes) {}
+public record LoadParams(File problemFile, List<File> classPath, File bootClassPath, List<File> includes) {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index 7f8509df70c..ef47a069c78 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -3,9 +3,16 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import de.uka.ilkd.key.proof.Node;
+
+import javax.swing.tree.TreeNode;
+
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public class TreeNodeDesc {
+public record TreeNodeDesc(KeyIdentifications.NodeId id, String name) {
+    public static TreeNodeDesc from(KeyIdentifications.ProofId proofId, Node root) {
+        return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, root.serialNr()), root.name());
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index cd4aa88b146..57f9ed59f98 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.antlr.runtime.tree.Tree;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index bcbff9a04ff..05ee6efe619 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -4,6 +4,7 @@
 package org.keyproject.key.api.remoteapi;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;

From 22ce93a6aefcc9b4e8de46e715511d49dafc950a Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Wed, 19 Feb 2025 15:11:28 +0100
Subject: [PATCH 28/50] Error message for python generation

---
 .../main/java/org/key_project/key/api/doc/ExtractMetaData.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 86a9bb7e945..377ebea06fb 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -159,7 +159,7 @@ private void addServerEndpoint(Method method) {
             return;
         }
 
-        throw new IllegalStateException();
+        throw new IllegalStateException("Method " + method + " is neither a request nor a notification");
     }
 
     private String findDocumentation(Method method) {

From 4c231eaefb7200269e4c9f83562f7850e4b01f48 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Wed, 19 Feb 2025 15:12:12 +0100
Subject: [PATCH 29/50] Updated library and example

---
 keyext.client.python/.gitignore               |   1 +
 keyext.client.python/keyapi/keydata.py        | 226 ++++++++----------
 keyext.client.python/keyapi/rpc.py            |  11 +-
 keyext.client.python/keyapi/server.py         | 187 ++-------------
 .../keyapi/server_internal.py                 | 159 ++++++++++++
 keyext.client.python/main.py                  |  37 +--
 6 files changed, 310 insertions(+), 311 deletions(-)
 create mode 100644 keyext.client.python/.gitignore
 create mode 100644 keyext.client.python/keyapi/server_internal.py

diff --git a/keyext.client.python/.gitignore b/keyext.client.python/.gitignore
new file mode 100644
index 00000000000..ed8ebf583f7
--- /dev/null
+++ b/keyext.client.python/.gitignore
@@ -0,0 +1 @@
+__pycache__
\ No newline at end of file
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index dfeaf76f7c7..929f200b307 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -4,21 +4,19 @@
 import typing
 from abc import abstractmethod, ABCMeta
 
-
 class ExampleDesc:
     """"""
 
-    name: str
+    name : str
     """"""
 
-    description: str
+    description : str
     """"""
 
     def __init__(self, name, description):
         self.name = name
         self.description = description
 
-
 class ProofScriptCommandDesc:
     """"""
 
@@ -29,16 +27,16 @@ def __init__(self, ):
 class ProofMacroDesc:
     """"""
 
-    name: str
+    name : str
     """"""
 
-    category: str
+    category : str
     """"""
 
-    description: str
+    description : str
     """"""
 
-    scriptCommandName: str
+    scriptCommandName : str
     """"""
 
     def __init__(self, name, category, description, scriptCommandName):
@@ -47,7 +45,6 @@ def __init__(self, name, category, description, scriptCommandName):
         self.description = description
         self.scriptCommandName = scriptCommandName
 
-
 class TraceValue(enum.Enum):
     """"""
 
@@ -55,88 +52,88 @@ class TraceValue(enum.Enum):
     Message = None
     All = None
 
-
 class SetTraceParams:
     """"""
 
-    value: TraceValue
+    value : TraceValue
     """"""
 
     def __init__(self, value):
         self.value = value
 
-
 class EnvironmentId:
     """"""
 
-    envId: str
+    envId : str
     """"""
 
     def __init__(self, envId):
         self.envId = envId
 
-
 class ProofId:
     """"""
 
-    env: EnvironmentId
+    env : EnvironmentId
     """"""
 
-    proofId: str
+    proofId : str
     """"""
 
     def __init__(self, env, proofId):
         self.env = env
         self.proofId = proofId
 
-
-class TreeNodeDesc:
+class NodeId:
     """"""
 
-    def __init__(self, ):
-        pass
-
-
-class TreeNodeId:
+    proofId : ProofId
     """"""
 
-    id: str
+    nodeId : int
     """"""
 
-    def __init__(self, id):
-        self.id = id
+    def __init__(self, proofId, nodeId):
+        self.proofId = proofId
+        self.nodeId = nodeId
 
+class TreeNodeDesc:
+    """"""
 
-class NodeId:
+    id : NodeId
     """"""
 
-    proofId: ProofId
+    name : str
     """"""
 
-    nodeId: int
+    def __init__(self, id, name):
+        self.id = id
+        self.name = name
+
+class TreeNodeId:
     """"""
 
-    def __init__(self, proofId, nodeId):
-        self.proofId = proofId
-        self.nodeId = nodeId
+    id : str
+    """"""
 
+    def __init__(self, id):
+        self.id = id
 
 class PrintOptions:
     """"""
 
-    unicode: bool
+    unicode : bool
     """"""
 
-    width: int
+    width : int
     """"""
 
-    indentation: int
+    indentation : int
     """"""
 
-    pure: bool
+    pure : bool
     """"""
 
-    termLabels: bool
+    termLabels : bool
     """"""
 
     def __init__(self, unicode, width, indentation, pure, termLabels):
@@ -146,45 +143,42 @@ def __init__(self, unicode, width, indentation, pure, termLabels):
         self.pure = pure
         self.termLabels = termLabels
 
-
 class NodeTextId:
     """"""
 
-    nodeId: NodeId
+    nodeId : NodeId
     """"""
 
-    nodeTextId: int
+    nodeTextId : int
     """"""
 
     def __init__(self, nodeId, nodeTextId):
         self.nodeId = nodeId
         self.nodeTextId = nodeTextId
 
-
 class NodeTextDesc:
     """"""
 
-    id: NodeTextId
+    id : NodeTextId
     """"""
 
-    result: str
+    result : str
     """"""
 
     def __init__(self, id, result):
         self.id = id
         self.result = result
 
-
 class TermActionId:
     """"""
 
-    nodeId: NodeId
+    nodeId : NodeId
     """"""
 
-    pio: str
+    pio : str
     """"""
 
-    id: str
+    id : str
     """"""
 
     def __init__(self, nodeId, pio, id):
@@ -192,7 +186,6 @@ def __init__(self, nodeId, pio, id):
         self.pio = pio
         self.id = id
 
-
 class TermActionKind(enum.Enum):
     """"""
 
@@ -201,23 +194,22 @@ class TermActionKind(enum.Enum):
     Macro = None
     Taclet = None
 
-
 class TermActionDesc:
     """"""
 
-    commandId: TermActionId
+    commandId : TermActionId
     """"""
 
-    displayName: str
+    displayName : str
     """"""
 
-    description: str
+    description : str
     """"""
 
-    category: str
+    category : str
     """"""
 
-    kind: TermActionKind
+    kind : TermActionKind
     """"""
 
     def __init__(self, commandId, displayName, description, category, kind):
@@ -227,7 +219,6 @@ def __init__(self, commandId, displayName, description, category, kind):
         self.category = category
         self.kind = kind
 
-
 class List:
     """"""
 
@@ -238,19 +229,19 @@ def __init__(self, ):
 class SortDesc:
     """"""
 
-    string: str
+    string : str
     """"""
 
-    documentation: str
+    documentation : str
     """"""
 
-    extendsSorts: List
+    extendsSorts : List
     """"""
 
-    anAbstract: bool
+    anAbstract : bool
     """"""
 
-    s: str
+    s : str
     """"""
 
     def __init__(self, string, documentation, extendsSorts, anAbstract, s):
@@ -260,29 +251,28 @@ def __init__(self, string, documentation, extendsSorts, anAbstract, s):
         self.anAbstract = anAbstract
         self.s = s
 
-
 class FunctionDesc:
     """"""
 
-    name: str
+    name : str
     """"""
 
-    sort: str
+    sort : str
     """"""
 
-    retSort: SortDesc
+    retSort : SortDesc
     """"""
 
-    argSorts: List
+    argSorts : List
     """"""
 
-    rigid: bool
+    rigid : bool
     """"""
 
-    unique: bool
+    unique : bool
     """"""
 
-    skolemConstant: bool
+    skolemConstant : bool
     """"""
 
     def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant):
@@ -294,40 +284,38 @@ def __init__(self, name, sort, retSort, argSorts, rigid, unique, skolemConstant)
         self.unique = unique
         self.skolemConstant = skolemConstant
 
-
 class ContractId:
     """"""
 
-    envId: EnvironmentId
+    envId : EnvironmentId
     """"""
 
-    contractId: int
+    contractId : str
     """"""
 
     def __init__(self, envId, contractId):
         self.envId = envId
         self.contractId = contractId
 
-
 class ContractDesc:
     """"""
 
-    contractId: ContractId
+    contractId : ContractId
     """"""
 
-    name: str
+    name : str
     """"""
 
-    displayName: str
+    displayName : str
     """"""
 
-    typeName: str
+    typeName : str
     """"""
 
-    htmlText: str
+    htmlText : str
     """"""
 
-    plainText: str
+    plainText : str
     """"""
 
     def __init__(self, contractId, name, displayName, typeName, htmlText, plainText):
@@ -338,50 +326,43 @@ def __init__(self, contractId, name, displayName, typeName, htmlText, plainText)
         self.htmlText = htmlText
         self.plainText = plainText
 
-
 class LoadParams:
     """"""
 
-    keyFile: str
+    problemFile : str
     """"""
 
-    javaFile: str
+    classPath : List
     """"""
 
-    classPath: List
+    bootClassPath : str
     """"""
 
-    bootClassPath: str
+    includes : List
     """"""
 
-    includes: List
-    """"""
-
-    def __init__(self, keyFile, javaFile, classPath, bootClassPath, includes):
-        self.keyFile = keyFile
-        self.javaFile = javaFile
+    def __init__(self, problemFile, classPath, bootClassPath, includes):
+        self.problemFile = problemFile
         self.classPath = classPath
         self.bootClassPath = bootClassPath
         self.includes = includes
 
-
-
 class ProblemDefinition:
     """"""
 
-    sorts: List
+    sorts : List
     """"""
 
-    functions: List
+    functions : List
     """"""
 
-    predicates: List
+    predicates : List
     """"""
 
-    antecTerms: List
+    antecTerms : List
     """"""
 
-    succTerms: List
+    succTerms : List
     """"""
 
     def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
@@ -391,21 +372,19 @@ def __init__(self, sorts, functions, predicates, antecTerms, succTerms):
         self.antecTerms = antecTerms
         self.succTerms = succTerms
 
-
 class LogTraceParams:
     """"""
 
-    messag: str
+    messag : str
     """"""
 
-    verbose: str
+    verbose : str
     """"""
 
     def __init__(self, messag, verbose):
         self.messag = messag
         self.verbose = verbose
 
-
 class MessageType(enum.Enum):
     """"""
 
@@ -416,31 +395,29 @@ class MessageType(enum.Enum):
     Log = None
     Debug = None
 
-
 class ShowMessageParams:
     """"""
 
-    type: MessageType
+    type : MessageType
     """"""
 
-    message: str
+    message : str
     """"""
 
     def __init__(self, type, message):
         self.type = type
         self.message = message
 
-
 class ShowMessageRequestParams:
     """"""
 
-    type: MessageType
+    type : MessageType
     """"""
 
-    message: str
+    message : str
     """"""
 
-    actions: List
+    actions : List
     """"""
 
     def __init__(self, type, message, actions):
@@ -448,44 +425,41 @@ def __init__(self, type, message, actions):
         self.message = message
         self.actions = actions
 
-
 class MessageActionItem:
     """"""
 
-    title: str
+    title : str
     """"""
 
     def __init__(self, title):
         self.title = title
 
-
 class Range:
     """"""
 
-    start: int
+    start : int
     """"""
 
-    end: int
+    end : int
     """"""
 
     def __init__(self, start, end):
         self.start = start
         self.end = end
 
-
 class ShowDocumentParams:
     """"""
 
-    uri: str
+    uri : str
     """"""
 
-    external: bool
+    external : bool
     """"""
 
-    takeFocus: bool
+    takeFocus : bool
     """"""
 
-    selection: Range
+    selection : Range
     """"""
 
     def __init__(self, uri, external, takeFocus, selection):
@@ -494,17 +468,15 @@ def __init__(self, uri, external, takeFocus, selection):
         self.takeFocus = takeFocus
         self.selection = selection
 
-
 class ShowDocumentResult:
     """"""
 
-    success: bool
+    success : bool
     """"""
 
     def __init__(self, success):
         self.success = success
 
-
 class TaskFinishedInfo:
     """"""
 
@@ -519,15 +491,5 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = {"ExampleDesc": ExampleDesc, "ProofScriptCommandDesc": ProofScriptCommandDesc,
-                    "ProofMacroDesc": ProofMacroDesc, "TraceValue": TraceValue, "SetTraceParams": SetTraceParams,
-                    "EnvironmentId": EnvironmentId, "ProofId": ProofId, "TreeNodeDesc": TreeNodeDesc,
-                    "TreeNodeId": TreeNodeId, "NodeId": NodeId, "PrintOptions": PrintOptions, "NodeTextId": NodeTextId,
-                    "NodeTextDesc": NodeTextDesc, "TermActionId": TermActionId, "TermActionKind": TermActionKind,
-                    "TermActionDesc": TermActionDesc, "List": List, "SortDesc": SortDesc, "FunctionDesc": FunctionDesc,
-                    "ContractId": ContractId, "ContractDesc": ContractDesc, "LoadParams": LoadParams,
-                    "ProblemDefinition": ProblemDefinition, "LogTraceParams": LogTraceParams,
-                    "MessageType": MessageType, "ShowMessageParams": ShowMessageParams,
-                    "ShowMessageRequestParams": ShowMessageRequestParams, "MessageActionItem": MessageActionItem,
-                    "Range": Range, "ShowDocumentParams": ShowDocumentParams, "ShowDocumentResult": ShowDocumentResult,
-                    "TaskFinishedInfo": TaskFinishedInfo, "TaskStartedInfo": TaskStartedInfo}
+KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"ProofMacroDesc": ProofMacroDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"List": List,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
index c112055e006..ef6dc7dc18e 100644
--- a/keyext.client.python/keyapi/rpc.py
+++ b/keyext.client.python/keyapi/rpc.py
@@ -109,8 +109,15 @@ def recv_response(self) -> object:
 
 
 def object_decoder(obj):
-    if '$type' in obj:
-        return KEY_DATA_CLASSES[obj["$type"]](**obj)
+    if type(obj) is list:
+        return [object_decoder(item) for item in obj]
+    if type(obj) is dict:
+        for k,v in obj.items():
+            obj[k] = object_decoder(v)
+        if '$class' in obj:
+            class_name = obj["$class"]
+            del obj["$class"]
+            return KEY_DATA_CLASSES[class_name](**obj)
     return obj
 
 
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
index 2940363e1c2..b92b68ad833 100644
--- a/keyext.client.python/keyapi/server.py
+++ b/keyext.client.python/keyapi/server.py
@@ -1,161 +1,26 @@
-from __future__ import annotations
-
-import abc
-from abc import abstractmethod
-
-from .keydata import *
-from .rpc import ServerBase, LspEndpoint
-
-
-# noinspection PyTypeChecker
-class KeyServer(ServerBase):
-
-    def __init__(self, endpoint: LspEndpoint):
-        super().__init__(endpoint)
-
-    def env_contracts(self, env: EnvironmentId) -> typing.List[ContractDesc]:
-        """"""
-
-        return self._call_sync("env/contracts", [env])
-
-    def env_functions(self, env: EnvironmentId) -> typing.List[FunctionDesc]:
-        """"""
-
-        return self._call_sync("env/functions", [env])
-
-    def env_openContract(self, contractId: ContractId) -> ProofId:
-        """"""
-
-        return self._call_sync("env/openContract", [contractId])
-
-    def env_sorts(self, env: EnvironmentId) -> typing.List[SortDesc]:
-        """"""
-
-        return self._call_sync("env/sorts", [env])
-
-    def examples_list(self, ) -> typing.List[ExampleDesc]:
-        """"""
-
-        return self._call_sync("examples/list", [])
-
-    def goal_actions(self, id: NodeTextId, pos: int) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self._call_sync("goal/actions", [id, pos])
-
-    def goal_apply_action(self, id: TermActionId) -> typing.List[TermActionDesc]:
-        """"""
-
-        return self._call_sync("goal/apply_action", [id])
-
-    def goal_free(self, id: NodeTextId):
-        """"""
-
-        return self._call_async("goal/free", [id])
-
-    def goal_print(self, id: NodeId, options: PrintOptions) -> NodeTextDesc:
-        """"""
-
-        return self._call_sync("goal/print", [id, options])
-
-    def loading_load(self, params: LoadParams) -> typing.Union[EnvironmentId, ProofId]:
-        """"""
-
-        return self._call_sync("loading/load", [params])
-
-    def loading_loadExample(self, id: str) -> ProofId:
-        """"""
-
-        return self._call_sync("loading/loadExample", [id])
-
-    def loading_loadKey(self, content: str) -> ProofId:
-        """"""
-
-        return self._call_sync("loading/loadKey", [content])
-
-    def loading_loadProblem(self, problem: ProblemDefinition) -> ProofId:
-        """"""
-
-        return self._call_sync("loading/loadProblem", [problem])
-
-    def loading_loadTerm(self, term: str) -> ProofId:
-        """"""
-
-        return self._call_sync("loading/loadTerm", [term])
-
-    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
-        """"""
-
-        return self._call_sync("meta/available_macros", [])
-
-    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
-        """"""
-
-        return self._call_sync("meta/available_script_commands", [])
-
-    def meta_version(self, ) -> str:
-        """"""
-
-        return self._call_sync("meta/version", [])
-
-    def proofTree_children(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self._call_sync("proofTree/children", [proof, nodeId])
-
-    def proofTree_root(self, id: ProofId) -> TreeNodeDesc:
-        """"""
-
-        return self._call_sync("proofTree/root", [id])
-
-    def proofTree_subtree(self, proof: ProofId, nodeId: TreeNodeId) -> typing.List[TreeNodeDesc]:
-        """"""
-
-        return self._call_sync("proofTree/subtree", [proof, nodeId])
-
-    def server_exit(self, ):
-        """"""
-
-        return self._call_async("server/exit", [])
-
-    def server_setTrace(self, params: SetTraceParams):
-        """"""
-
-        return self._call_async("server/setTrace", [params])
-
-    def server_shutdown(self, ) -> bool:
-        """"""
-
-        return self._call_sync("server/shutdown", [])
-
-
-class Client(abc.ABCMeta):
-    @abstractmethod
-    def client_logTrace(self, params: LogTraceParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sayHello(self, e: str):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_showDocument(self, params: ShowDocumentParams) -> ShowDocumentResult:
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_sm(self, params: ShowMessageParams):
-        """"""
-
-        pass
-
-    @abstractmethod
-    def client_userResponse(self, params: ShowMessageRequestParams) -> MessageActionItem:
-        """"""
-
-        pass
+import socket
+from keyapi import LspEndpoint, LoadParams
+from keyapi.server_internal import KeyServer
+from keyapi.rpc import JsonRpcEndpoint
+
+class NetKeY(object):
+    def __init__(self, target):
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.connect(target)
+        self.inStream = self.socket.makefile("r", newline="\r\n")
+        self.outStream = self.socket.makefile("w", newline="\r\n")
+
+        self.rpc_endpoint = JsonRpcEndpoint(self.inStream, self.outStream)
+        endpoint = LspEndpoint(self.rpc_endpoint)
+        endpoint.start()
+
+        self.key = KeyServer(endpoint)
+
+    def __enter__(self):
+        return self.key
+
+    def __exit__(self, type, value, traceback):
+        self.key.server_exit()
+        self.inStream.close()
+        self.outStream.close()
+        self.socket.close()
\ No newline at end of file
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
new file mode 100644
index 00000000000..1ac68a0379d
--- /dev/null
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -0,0 +1,159 @@
+from __future__ import annotations
+from .keydata import *
+from .rpc import ServerBase, LspEndpoint
+
+import enum
+import abc
+import typing
+from abc import abstractmethod
+class KeyServer(ServerBase):
+
+    def __init__(self, endpoint : LspEndpoint):
+        super().__init__(endpoint)
+
+    def env_contracts(self, env : EnvironmentId) -> typing.List[ContractDesc]:
+       """"""
+
+       return self._call_sync("env/contracts", [env])
+
+    def env_functions(self, env : EnvironmentId) -> typing.List[FunctionDesc]:
+       """"""
+
+       return self._call_sync("env/functions", [env])
+
+    def env_openContract(self, contractId : ContractId) -> ProofId:
+       """"""
+
+       return self._call_sync("env/openContract", [contractId])
+
+    def env_sorts(self, env : EnvironmentId) -> typing.List[SortDesc]:
+       """"""
+
+       return self._call_sync("env/sorts", [env])
+
+    def examples_list(self, ) -> typing.List[ExampleDesc]:
+       """"""
+
+       return self._call_sync("examples/list", [])
+
+    def goal_actions(self, id : NodeTextId, pos : int) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/actions", [id , pos])
+
+    def goal_apply_action(self, id : TermActionId) -> typing.List[TermActionDesc]:
+       """"""
+
+       return self._call_sync("goal/apply_action", [id])
+
+    def goal_free(self, id : NodeTextId):
+        """"""
+
+        return self._call_async("goal/free", [id])
+
+    def goal_print(self, id : NodeId, options : PrintOptions) -> NodeTextDesc:
+       """"""
+
+       return self._call_sync("goal/print", [id , options])
+
+    def loading_load(self, params : LoadParams) -> typing.Union[EnvironmentId, ProofId]:
+       """"""
+
+       return self._call_sync("loading/load", [params])
+
+    def loading_loadExample(self, id : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadExample", [id])
+
+    def loading_loadKey(self, content : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadKey", [content])
+
+    def loading_loadProblem(self, problem : ProblemDefinition) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadProblem", [problem])
+
+    def loading_loadTerm(self, term : str) -> ProofId:
+       """"""
+
+       return self._call_sync("loading/loadTerm", [term])
+
+    def meta_available_macros(self, ) -> typing.List[ProofMacroDesc]:
+       """"""
+
+       return self._call_sync("meta/available_macros", [])
+
+    def meta_available_script_commands(self, ) -> typing.List[ProofScriptCommandDesc]:
+       """"""
+
+       return self._call_sync("meta/available_script_commands", [])
+
+    def meta_version(self, ) -> str:
+       """"""
+
+       return self._call_sync("meta/version", [])
+
+    def proofTree_children(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/children", [proof , nodeId])
+
+    def proofTree_root(self, id : ProofId) -> TreeNodeDesc:
+       """"""
+
+       return self._call_sync("proofTree/root", [id])
+
+    def proofTree_subtree(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
+       """"""
+
+       return self._call_sync("proofTree/subtree", [proof , nodeId])
+
+    def server_exit(self, ):
+        """"""
+
+        return self._call_async("server/exit", [])
+
+    def server_setTrace(self, params : SetTraceParams):
+        """"""
+
+        return self._call_async("server/setTrace", [params])
+
+    def server_shutdown(self, ) -> bool:
+       """"""
+
+       return self._call_sync("server/shutdown", [])
+
+class Client(abc.ABCMeta):
+    @abstractmethod
+    def client_logTrace(self, params : LogTraceParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sayHello(self, e : str):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_showDocument(self, params : ShowDocumentParams) -> ShowDocumentResult:
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_sm(self, params : ShowMessageParams):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_userResponse(self, params : ShowMessageRequestParams) -> MessageActionItem:
+        """"""
+
+        pass
+
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index d12fadea42a..bd5340f7bd2 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -1,27 +1,32 @@
 import socket
 from keyapi import LspEndpoint, LoadParams
-from keyapi.server import KeyServer
+from keyapi.server import NetKeY
 from keyapi.rpc import JsonRpcEndpoint
 
 if __name__ == "__main__":
     target = ("localhost", 5151)
 
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.connect(target)
-        input = s.makefile("r", newline="\r\n")
-        output = s.makefile("w", newline="\r\n")
+    with NetKeY(target) as key:
+        print(key.meta_version())
+        envHandle = key.loading_load(
+            LoadParams("/home/samuel/Dokumente/Projects/KeY/key/key.core.example/example/IntegerUtil.java",
+                       None,
+                       None,
+                       None))
 
-        rpc_endpoint = JsonRpcEndpoint(input, output)
-        endpoint = LspEndpoint(rpc_endpoint)
-        endpoint.start()
+        contracts = key.env_contracts(envHandle)
 
-        key = KeyServer(endpoint)
-        print(key.meta_version())
-        ex = key.examples_list()
-        print(ex)
+        print([c.contractId for c in contracts])
+
+        proof_id = key.env_openContract(contracts[0].contractId)
+
+        print(proof_id.proofId)
+
+        print("Loading Root Node:")
+        root_node = key.proofTree_root(proof_id)
+
+        print("Root Node: ",root_node.name)
 
-        proofHandle = key.loading_load(
-            LoadParams("/home/weigl/work/key/key.ui/examples/standard_key/prop_log/contraposition.key",
-                       None, None, None, None))
+        key.auto
 
-        print(proofHandle)
+    print("Terminating")

From 6cfba3d86c8f0ffa806a8acd91ccdc6c54ff1f46 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 10:00:27 +0100
Subject: [PATCH 30/50] Added proof api endpoint

---
 .../org/keyproject/key/api/KeyApiImpl.java    |  8 +-
 .../key/api/remoteapi/ProofApi.java           |  6 +-
 keyext.client.python/keyapi/keydata.py        | 79 +++++++++++++++----
 .../keyapi/server_internal.py                 | 45 +++++++++++
 keyext.client.python/main.py                  |  4 +-
 5 files changed, 120 insertions(+), 22 deletions(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 965c99343aa..ffb84c4f7da 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -35,7 +35,9 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
+import de.uka.ilkd.key.settings.ProofSettings;
 import de.uka.ilkd.key.speclang.PositionedString;
+import de.uka.ilkd.key.strategy.StrategyProperties;
 import de.uka.ilkd.key.util.KeYConstants;
 
 import org.key_project.util.collection.ImmutableList;
@@ -169,7 +171,7 @@ public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions
             try {
                 env.getProofControl().startAndWaitForAutoMode(proof);
                 // clientListener);
-                return null;// MacroStatistic.from(proofId, info);
+                return null; //MacroStatistic.from(proofId, info);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -253,13 +255,13 @@ public CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId) {
         return null;
     }
 
-    @Override
+    /*@Override
     public CompletableFuture<Statistics> statistics(ProofId proofId) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             return proof.getStatistics();
         });
-    }
+    }*/
 
     @Override
     public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index 8d0fc27154d..8114df16234 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -9,6 +9,7 @@
 import de.uka.ilkd.key.proof.Statistics;
 
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
@@ -18,6 +19,7 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
+@JsonSegment("proof")
 public interface ProofApi {
     @JsonRequest
     CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
@@ -48,6 +50,6 @@ CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId,
     @JsonRequest
     CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId);
 
-    @JsonRequest
-    CompletableFuture<Statistics> statistics(ProofId proof);
+    // @JsonRequest
+    // CompletableFuture<Statistics> statistics(ProofId proof);
 }
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index 929f200b307..5e377394f4a 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -17,13 +17,6 @@ def __init__(self, name, description):
         self.name = name
         self.description = description
 
-class ProofScriptCommandDesc:
-    """"""
-
-    def __init__(self, ):
-        pass
-
-
 class ProofMacroDesc:
     """"""
 
@@ -45,6 +38,13 @@ def __init__(self, name, category, description, scriptCommandName):
         self.description = description
         self.scriptCommandName = scriptCommandName
 
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
 class TraceValue(enum.Enum):
     """"""
 
@@ -96,6 +96,62 @@ def __init__(self, proofId, nodeId):
         self.proofId = proofId
         self.nodeId = nodeId
 
+class List:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class NodeDesc:
+    """"""
+
+    nodeid : NodeId
+    """"""
+
+    branchLabel : str
+    """"""
+
+    scriptRuleApplication : bool
+    """"""
+
+    children : List
+    """"""
+
+    def __init__(self, nodeid, branchLabel, scriptRuleApplication, children):
+        self.nodeid = nodeid
+        self.branchLabel = branchLabel
+        self.scriptRuleApplication = scriptRuleApplication
+        self.children = children
+
+class StreategyOptions:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
+class MacroStatistic:
+    """"""
+
+    proofId : ProofId
+    """"""
+
+    macroId : str
+    """"""
+
+    appliedRules : int
+    """"""
+
+    closedGoals : int
+    """"""
+
+    def __init__(self, proofId, macroId, appliedRules, closedGoals):
+        self.proofId = proofId
+        self.macroId = macroId
+        self.appliedRules = appliedRules
+        self.closedGoals = closedGoals
+
 class TreeNodeDesc:
     """"""
 
@@ -219,13 +275,6 @@ def __init__(self, commandId, displayName, description, category, kind):
         self.category = category
         self.kind = kind
 
-class List:
-    """"""
-
-    def __init__(self, ):
-        pass
-
-
 class SortDesc:
     """"""
 
@@ -491,5 +540,5 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"ProofMacroDesc": ProofMacroDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"List": List,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofMacroDesc": ProofMacroDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"List": List,"NodeDesc": NodeDesc,"StreategyOptions": StreategyOptions,"MacroStatistic": MacroStatistic,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
 
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
index 1ac68a0379d..884ede235da 100644
--- a/keyext.client.python/keyapi/server_internal.py
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -96,6 +96,51 @@ def meta_version(self, ) -> str:
 
        return self._call_sync("meta/version", [])
 
+    def proof_auto(self, proof : ProofId, options : StreategyOptions) -> MacroStatistic:
+       """"""
+
+       return self._call_sync("proof/auto", [proof , options])
+
+    def proof_children(self, nodeId : NodeId) -> typing.List[NodeDesc]:
+       """"""
+
+       return self._call_sync("proof/children", [nodeId])
+
+    def proof_dispose(self, proof : ProofId) -> bool:
+       """"""
+
+       return self._call_sync("proof/dispose", [proof])
+
+    def proof_goals(self, proof : ProofId, onlyOpened : bool, onlyEnabled : bool) -> typing.List[NodeDesc]:
+       """"""
+
+       return self._call_sync("proof/goals", [proof , onlyOpened , onlyEnabled])
+
+    def proof_macro(self, proof : ProofId, macroId : str, options : StreategyOptions) -> MacroStatistic:
+       """"""
+
+       return self._call_sync("proof/macro", [proof , macroId , options])
+
+    def proof_pruneTo(self, nodeId : NodeId) -> typing.List[NodeDesc]:
+       """"""
+
+       return self._call_sync("proof/pruneTo", [nodeId])
+
+    def proof_root(self, proof : ProofId) -> NodeDesc:
+       """"""
+
+       return self._call_sync("proof/root", [proof])
+
+    def proof_script(self, proof : ProofId, scriptLine : str, options : StreategyOptions) -> MacroStatistic:
+       """"""
+
+       return self._call_sync("proof/script", [proof , scriptLine , options])
+
+    def proof_tree(self, proof : ProofId) -> NodeDesc:
+       """"""
+
+       return self._call_sync("proof/tree", [proof])
+
     def proofTree_children(self, proof : ProofId, nodeId : TreeNodeId) -> typing.List[TreeNodeDesc]:
        """"""
 
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index bd5340f7bd2..57c07bb77b8 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -1,5 +1,5 @@
 import socket
-from keyapi import LspEndpoint, LoadParams
+from keyapi import LspEndpoint, LoadParams, StreategyOptions
 from keyapi.server import NetKeY
 from keyapi.rpc import JsonRpcEndpoint
 
@@ -27,6 +27,6 @@
 
         print("Root Node: ",root_node.name)
 
-        key.auto
+        key.proof_auto(proof_id, StreategyOptions())
 
     print("Terminating")

From 979ff7d42ff6172922d8533f1691e9fd3c0764ac Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 10:43:27 +0100
Subject: [PATCH 31/50] Attempt at reseting proof control

---
 .../key/control/AbstractProofControl.java     | 14 ++++++---
 .../ilkd/key/control/DefaultProofControl.java | 30 +++++--------------
 .../de/uka/ilkd/key/control/ProofControl.java | 11 ++++---
 .../uka/ilkd/key/gui/ProofScriptWorker.java   |  7 -----
 .../key/gui/actions/RunAllProofsAction.java   |  7 ++---
 .../uka/ilkd/key/ui/MediatorProofControl.java | 22 +++++---------
 .../ilkd/key/gui/testgen/TGInfoDialog.java    |  9 ++----
 7 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
index e466b3e4876..0d3fd45622c 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java
@@ -550,12 +550,19 @@ protected void fireAutoModeStopped(ProofEvent e) {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void startAutoMode(Proof proof) {
+        startAutoMode(proof, proof.openEnabledGoals());
+    }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
+    public void startAndWaitForAutoMode(Proof proof) {
         startAutoMode(proof);
         waitWhileAutoMode();
     }
@@ -564,8 +571,7 @@ public void startAndWaitForAutoMode(Proof proof) throws InterruptedException {
      * {@inheritDoc}
      */
     @Override
-    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
-            throws InterruptedException {
+    public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals) {
         startAutoMode(proof, goals);
         waitWhileAutoMode();
     }
@@ -574,7 +580,7 @@ public void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
      * {@inheritDoc}
      */
     @Override
-    public void stopAndWaitAutoMode() throws InterruptedException {
+    public void stopAndWaitAutoMode() {
         stopAutoMode();
         waitWhileAutoMode();
     }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
index 00a423b76c5..df59e0c1ae7 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/DefaultProofControl.java
@@ -3,9 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.control;
 
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
 import de.uka.ilkd.key.logic.PosInOccurrence;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
@@ -38,11 +35,6 @@ public class DefaultProofControl extends AbstractProofControl {
      */
     private Thread autoModeThread;
 
-    /**
-     * A condition which is non-null during auto-mode. You can wait for end of macro/auto on it.
-     */
-    private Condition inAutoMode;
-
     /**
      * Constructor.
      *
@@ -87,17 +79,19 @@ public synchronized void stopAutoMode() {
         }
     }
 
-
     @Override
-    public void waitWhileAutoMode() throws InterruptedException {
-        if (inAutoMode != null) {
-            inAutoMode.await();
+    public void waitWhileAutoMode() {
+        while (isInAutoMode()) { // Wait until auto mode has stopped.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+            }
         }
     }
 
     @Override
     public boolean isInAutoMode() {
-        return inAutoMode != null;
+        return autoModeThread != null;
     }
 
     private class AutoModeThread extends Thread {
@@ -111,9 +105,6 @@ public AutoModeThread(Proof proof, ImmutableList<Goal> goals, ProverTaskListener
             this.proof = proof;
             this.goals = goals;
             this.ptl = ptl;
-
-            var lock = new ReentrantLock();
-            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -131,8 +122,6 @@ public void run() {
                     starter.start();
                 }
             } finally {
-                inAutoMode.signalAll();
-                inAutoMode = null;
                 autoModeThread = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
@@ -161,9 +150,6 @@ public MacroThread(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
             this.node = node;
             this.macro = macro;
             this.posInOcc = posInOcc;
-
-            var lock = new ReentrantLock();
-            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -186,9 +172,7 @@ public void run() {
                 if (ptl != null) {
                     ptl.taskFinished(info);
                 }
-                inAutoMode.signalAll();
                 autoModeThread = null;
-                inAutoMode = null;
                 fireAutoModeStopped(new ProofEvent(proof));
             }
         }
diff --git a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index 3b5971cbb72..77b71eaf5df 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
@@ -123,7 +123,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      *
      * @param proof The {@link Proof} to start auto mode of.
      */
-    default void startAutoMode(Proof proof) { startAutoMode(proof, proof.openEnabledGoals()); }
+    void startAutoMode(Proof proof);
 
     /**
      * Starts the auto mode for the given {@link Proof} and the given {@link Goal}s.
@@ -143,13 +143,13 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * Stops the currently running auto mode and blocks the current {@link Thread} until auto mode
      * has stopped.
      */
-    void stopAndWaitAutoMode() throws InterruptedException;
+    void stopAndWaitAutoMode();
 
     /**
      * Blocks the current {@link Thread} while the auto mode of this {@link UserInterfaceControl} is
      * active.
      */
-    void waitWhileAutoMode() throws InterruptedException;
+    void waitWhileAutoMode();
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -158,8 +158,7 @@ void selectedBuiltInRule(Goal goal, BuiltInRule rule, PosInOccurrence pos,
      * @param proof The {@link Proof} to start auto mode and to wait for.
      * @param goals The {@link Goal}s to close.
      */
-    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
-            throws InterruptedException;
+    void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals);
 
     /**
      * Starts the auto mode for the given proof which must be contained in this user interface and
@@ -167,7 +166,7 @@ void startAndWaitForAutoMode(Proof proof, ImmutableList<Goal> goals)
      *
      * @param proof The {@link Proof} to start auto mode and to wait for.
      */
-    void startAndWaitForAutoMode(Proof proof) throws InterruptedException;
+    void startAndWaitForAutoMode(Proof proof);
 
     void startFocussedAutoMode(PosInOccurrence focus, Goal goal);
 
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
index 90c9398b076..6c94d762e00 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java
@@ -183,13 +183,6 @@ public void done() {
         }
 
         mediator.removeInterruptedListener(this);
-        runWithDeadline(() -> mediator.startInterface(true), 1000);
-        runWithDeadline(() -> {
-            try {
-                mediator.getUI().getProofControl().stopAndWaitAutoMode();
-            } catch (InterruptedException ignored) {
-            }
-        }, 1000);
 
         final Proof proof = initiallySelectedGoal != null ? initiallySelectedGoal.proof()
                 : mediator.getSelectedProof();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index b62b8dd8fcd..b95e443df85 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -113,8 +113,8 @@ public RunAllProofsAction(MainWindow mainWindow) {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-
         WindowUserInterfaceControl ui = mainWindow.getUserInterface();
+
         for (int i = 0; i < files.size(); i++) {
             LOGGER.info("{}: {}\n", i, files.get(i));
         }
@@ -133,10 +133,7 @@ public void actionPerformed(ActionEvent e) {
                 MediatorProofControl control = ui.getProofControl();
                 if (control.isAutoModeSupported(proof)) {
                     control.startAutoMode(proof, proof.openEnabledGoals());
-                    try {
-                        control.waitWhileAutoMode();
-                    } catch (InterruptedException ignored) {
-                    }
+                    control.waitWhileAutoMode();
                 }
                 LOGGER.info("Finish: ({}) {}", getMediator().getSelectedProof().closed(), absFile);
                 getMediator().getSelectedProof().dispose();
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
index 839de98f341..54009075944 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import javax.swing.*;
 
@@ -47,8 +45,6 @@ public class MediatorProofControl extends AbstractProofControl {
     private final AbstractMediatorUserInterfaceControl ui;
     private AutoModeWorker worker;
 
-    private Condition inAutoMode;
-
     public MediatorProofControl(AbstractMediatorUserInterfaceControl ui) {
         super(ui, ui);
         this.ui = ui;
@@ -105,14 +101,17 @@ public void stopAutoMode() {
      * {@inheritDoc}
      */
     @Override
-    public void waitWhileAutoMode() throws InterruptedException {
+    public void waitWhileAutoMode() {
         if (SwingUtilities.isEventDispatchThread()) {
             LOGGER.error("", new IllegalStateException(
                 "tried to block the UI thread whilst waiting for auto mode to finish"));
             return; // do not block the UI thread
         }
-        if (inAutoMode != null) {
-            inAutoMode.await();
+        while (ui.getMediator().isInAutoMode()) { // Wait until auto mode has stopped.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+            }
         }
     }
 
@@ -139,7 +138,6 @@ public boolean isAutoModeSupported(Proof proof) {
     public void runMacro(Node node, ProofMacro macro, PosInOccurrence posInOcc) {
         KeYMediator mediator = ui.getMediator();
         final ProofMacroWorker worker = new ProofMacroWorker(node, macro, mediator, posInOcc);
-        inAutoMode = worker.getFinish();
         interactionListeners.forEach(worker::addInteractionListener);
         mediator.initiateAutoMode(node.proof(), true, false);
         mediator.addInterruptedListener(worker);
@@ -176,9 +174,6 @@ public AutoModeWorker(final Proof proof, final ImmutableList<Goal> goals,
             if (ui.getMediator().getAutoSaver() != null) {
                 applyStrategy.addProverTaskObserver(ui.getMediator().getAutoSaver());
             }
-
-            var lock = new ReentrantLock();
-            inAutoMode = lock.newCondition();
         }
 
         @Override
@@ -190,9 +185,6 @@ protected void done() {
             } catch (final CancellationException exception) {
                 // when the user canceled it's not an error
             } finally {
-                // release threads waiting on automode finish
-                inAutoMode.signalAll();
-
                 // make it possible to free memory and falsify the isAutoMode() property
                 worker = null;
                 // Clear strategy
@@ -220,7 +212,7 @@ private void notifyException(final Throwable exception) {
         }
 
         @Override
-        protected ApplyStrategyInfo doInBackground() {
+        protected ApplyStrategyInfo doInBackground() throws Exception {
             boolean stopMode =
                 proof.getSettings().getStrategySettings().getActiveStrategyProperties()
                         .getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY)
diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
index 045e315d72c..087e4c5d59f 100644
--- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
+++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java
@@ -35,12 +35,9 @@ public void actionPerformed(ActionEvent e) {
             // This method delegates the request only to the UserInterfaceControl
             // which implements the functionality. No functionality is allowed in this method body!
             new Thread(() -> {
-                try {
-                    MainWindow.getInstance().getMediator().getUI().getProofControl()
-                            .stopAndWaitAutoMode();
-                    ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
-                } catch (InterruptedException ignore) {
-                }
+                MainWindow.getInstance().getMediator().getUI().getProofControl()
+                        .stopAndWaitAutoMode();
+                ThreadUtilities.invokeOnEventQueue(() -> exitButton.setEnabled(true));
             }).start();
         }
     };

From b80d36a04c242b2042e82be264748d9b596c1c77 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 13:20:28 +0100
Subject: [PATCH 32/50] First (incomplete) working proof management endpoint

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 41 +++++++++++++++----
 .../keyproject/key/api/data/ProofStatus.java  |  9 ++++
 .../key/api/data/TaskFinishedInfo.java        |  7 ++++
 .../key/api/data/TaskStartedInfo.java         |  7 ++++
 .../key/api/remoteapi/ProofApi.java           |  5 +--
 .../key/api/remoteclient/ClientApi.java       | 10 ++---
 6 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index ffb84c4f7da..3a615a73e66 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -63,7 +63,7 @@ public final class KeyApiImpl implements KeyApi {
     private final ProverTaskListener clientListener = new ProverTaskListener() {
         @Override
         public void taskStarted(TaskStartedInfo info) {
-            clientApi.taskStarted(info);
+            clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
         @Override
@@ -73,7 +73,7 @@ public void taskProgress(int position) {
 
         @Override
         public void taskFinished(TaskFinishedInfo info) {
-            clientApi.taskFinished(info);
+            clientApi.taskFinished(org.keyproject.key.api.data.TaskFinishedInfo.from(info));
         }
     };
     private final AtomicInteger uniqueCounter = new AtomicInteger();
@@ -164,14 +164,15 @@ public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId,
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions options) {
+    public CompletableFuture<ProofStatus> auto(ProofId proofId, StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
+            configureProofMode(proof, options);
             try {
                 env.getProofControl().startAndWaitForAutoMode(proof);
                 // clientListener);
-                return null; //MacroStatistic.from(proofId, info);
+                return ProofStatus.from(proofId, proof);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -179,6 +180,30 @@ public CompletableFuture<MacroStatistic> auto(ProofId proofId, StreategyOptions
 
     }
 
+    private static void configureProofMode(Proof proof, StreategyOptions options) {
+        StrategyProperties sp =
+                proof.getSettings().getStrategySettings().getActiveStrategyProperties();
+        sp.setProperty(StrategyProperties.METHOD_OPTIONS_KEY,
+                StrategyProperties.METHOD_CONTRACT);
+        sp.setProperty(StrategyProperties.DEP_OPTIONS_KEY,
+                StrategyProperties.DEP_ON);
+        sp.setProperty(StrategyProperties.QUERY_OPTIONS_KEY,
+                StrategyProperties.QUERY_ON);
+        sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY,
+                StrategyProperties.NON_LIN_ARITH_DEF_OPS);
+        sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY,
+                StrategyProperties.STOPMODE_NONCLOSE);
+        proof.getSettings().getStrategySettings().setActiveStrategyProperties(sp);
+        // Make sure that the new options are used
+        int maxSteps = 10000;
+        ProofSettings.DEFAULT_SETTINGS.getStrategySettings().setMaxSteps(maxSteps);
+        ProofSettings.DEFAULT_SETTINGS.getStrategySettings()
+                .setActiveStrategyProperties(sp);
+        proof.getSettings().getStrategySettings().setMaxSteps(maxSteps);
+        proof.setActiveStrategy(proof.getServices().getProfile()
+                .getDefaultStrategyFactory().create(proof, sp));
+    }
+
     @Override
     public CompletableFuture<Boolean> dispose(ProofId id) {
         return CompletableFuture.supplyAsync(() -> {
@@ -498,7 +523,7 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
     private class MyDefaultUserInterfaceControl extends DefaultUserInterfaceControl {
         @Override
         public void taskStarted(TaskStartedInfo info) {
-            clientApi.taskStarted(info);
+            clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
         @Override
@@ -508,17 +533,17 @@ public void taskProgress(int position) {
 
         @Override
         public void taskFinished(TaskFinishedInfo info) {
-            clientApi.taskFinished(info);
+            clientApi.taskFinished(org.keyproject.key.api.data.TaskFinishedInfo.from(info));
         }
 
         @Override
         protected void macroStarted(TaskStartedInfo info) {
-            clientApi.taskStarted(info);
+            clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
         @Override
         protected synchronized void macroFinished(ProofMacroFinishedInfo info) {
-            clientApi.taskFinished(info);
+            clientApi.taskFinished(org.keyproject.key.api.data.TaskFinishedInfo.from(info));
         }
 
         @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
new file mode 100644
index 00000000000..195d3e280de
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -0,0 +1,9 @@
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.proof.Proof;
+
+public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals) {
+    public static ProofStatus from(KeyIdentifications.ProofId id, Proof proof) {
+        return new ProofStatus(id, proof.openGoals().size(), proof.closedGoals().size());
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
new file mode 100644
index 00000000000..bf22f392105
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -0,0 +1,7 @@
+package org.keyproject.key.api.data;
+
+public record TaskFinishedInfo() {
+    public static TaskFinishedInfo from(de.uka.ilkd.key.prover.TaskFinishedInfo info) {
+        return new TaskFinishedInfo();
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
new file mode 100644
index 00000000000..e0f159b2224
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -0,0 +1,7 @@
+package org.keyproject.key.api.data;
+
+public record TaskStartedInfo() {
+    public static TaskStartedInfo from(de.uka.ilkd.key.prover.TaskStartedInfo info) {
+        return new TaskStartedInfo();
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index 8114df16234..a7c6a4dbacb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -6,13 +6,12 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import de.uka.ilkd.key.proof.Statistics;
-
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
+import org.keyproject.key.api.data.ProofStatus;
 import org.keyproject.key.api.data.StreategyOptions;
 
 /**
@@ -30,7 +29,7 @@ CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId,
             StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> auto(ProofId proof, StreategyOptions options);
+    CompletableFuture<ProofStatus> auto(ProofId proof, StreategyOptions options);
 
     @JsonRequest
     CompletableFuture<Boolean> dispose(ProofId proof);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index fe34e79927e..4d1a08c5662 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -6,9 +6,6 @@
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nullable;
 
-import de.uka.ilkd.key.prover.TaskFinishedInfo;
-import de.uka.ilkd.key.prover.TaskStartedInfo;
-
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
@@ -77,10 +74,13 @@ public interface ClientApi {
     CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
 
 
-    void taskFinished(TaskFinishedInfo info);
+    @JsonNotification
+    void taskFinished(org.keyproject.key.api.data.TaskFinishedInfo info);
 
+    @JsonNotification
     void taskProgress(int position);
 
-    void taskStarted(TaskStartedInfo info);
+    @JsonNotification
+    void taskStarted(org.keyproject.key.api.data.TaskStartedInfo info);
     // endregion
 }

From d6c37d20a7710277023d06c900ec65ab8d50930a Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 13:21:12 +0100
Subject: [PATCH 33/50] Updated python client for proof endpoint

---
 keyext.client.python/keyapi/keydata.py        | 19 +++++++++++++++++-
 keyext.client.python/keyapi/server.py         | 14 +++++++++----
 .../keyapi/server_internal.py                 | 20 ++++++++++++++++++-
 keyext.client.python/main.py                  | 12 +++++++++--
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index 5e377394f4a..e59e79cb9bb 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -152,6 +152,23 @@ def __init__(self, proofId, macroId, appliedRules, closedGoals):
         self.appliedRules = appliedRules
         self.closedGoals = closedGoals
 
+class ProofStatus:
+    """"""
+
+    id : ProofId
+    """"""
+
+    openGoals : int
+    """"""
+
+    closedGoals : int
+    """"""
+
+    def __init__(self, id, openGoals, closedGoals):
+        self.id = id
+        self.openGoals = openGoals
+        self.closedGoals = closedGoals
+
 class TreeNodeDesc:
     """"""
 
@@ -540,5 +557,5 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofMacroDesc": ProofMacroDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"List": List,"NodeDesc": NodeDesc,"StreategyOptions": StreategyOptions,"MacroStatistic": MacroStatistic,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofMacroDesc": ProofMacroDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"List": List,"NodeDesc": NodeDesc,"StreategyOptions": StreategyOptions,"MacroStatistic": MacroStatistic,"ProofStatus": ProofStatus,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
 
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
index b92b68ad833..35263f3d571 100644
--- a/keyext.client.python/keyapi/server.py
+++ b/keyext.client.python/keyapi/server.py
@@ -11,13 +11,19 @@ def __init__(self, target):
         self.outStream = self.socket.makefile("w", newline="\r\n")
 
         self.rpc_endpoint = JsonRpcEndpoint(self.inStream, self.outStream)
-        endpoint = LspEndpoint(self.rpc_endpoint)
-        endpoint.start()
+        self.endpoint = LspEndpoint(self.rpc_endpoint)
+        self.endpoint.start()
 
-        self.key = KeyServer(endpoint)
+        self.key = KeyServer(self.endpoint)
 
     def __enter__(self):
-        return self.key
+        return self
+
+    def __getattr__(self, item):
+        return getattr(self.key, item)
+
+    def register_notification(self, method, callback):
+        self.endpoint.notify_callbacks[method] = callback
 
     def __exit__(self, type, value, traceback):
         self.key.server_exit()
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
index 884ede235da..388af409734 100644
--- a/keyext.client.python/keyapi/server_internal.py
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -96,7 +96,7 @@ def meta_version(self, ) -> str:
 
        return self._call_sync("meta/version", [])
 
-    def proof_auto(self, proof : ProofId, options : StreategyOptions) -> MacroStatistic:
+    def proof_auto(self, proof : ProofId, options : StreategyOptions) -> ProofStatus:
        """"""
 
        return self._call_sync("proof/auto", [proof , options])
@@ -196,6 +196,24 @@ def client_sm(self, params : ShowMessageParams):
 
         pass
 
+    @abstractmethod
+    def client_taskFinished(self, info : TaskFinishedInfo):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_taskProgress(self, position : int):
+        """"""
+
+        pass
+
+    @abstractmethod
+    def client_taskStarted(self, info : TaskStartedInfo):
+        """"""
+
+        pass
+
     @abstractmethod
     def client_userResponse(self, params : ShowMessageRequestParams) -> MessageActionItem:
         """"""
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index 57c07bb77b8..c69c44f9fdf 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -3,11 +3,17 @@
 from keyapi.server import NetKeY
 from keyapi.rpc import JsonRpcEndpoint
 
+def configure_callbacks(key):
+    key.register_notification("client/taskStarted", lambda param: print("[KeY Notification] Task started"))
+    key.register_notification("client/taskFinished", lambda param: print("[KeY Notification] Task finished"))
+    key.register_notification("client/taskProgress", lambda param: print("[KeY Notification] Task progress: ", param))
+
 if __name__ == "__main__":
     target = ("localhost", 5151)
 
     with NetKeY(target) as key:
         print(key.meta_version())
+        configure_callbacks(key)
         envHandle = key.loading_load(
             LoadParams("/home/samuel/Dokumente/Projects/KeY/key/key.core.example/example/IntegerUtil.java",
                        None,
@@ -18,7 +24,7 @@
 
         print([c.contractId for c in contracts])
 
-        proof_id = key.env_openContract(contracts[0].contractId)
+        proof_id = key.env_openContract(contracts[1].contractId)
 
         print(proof_id.proofId)
 
@@ -27,6 +33,8 @@
 
         print("Root Node: ",root_node.name)
 
-        key.proof_auto(proof_id, StreategyOptions())
+        proof_status = key.proof_auto(proof_id, StreategyOptions())
+        print("Open goals: ", proof_status.openGoals)
+        #print("Closed goals: ", proof_status.closedGoals)
 
     print("Terminating")

From a70a80081c8030f2742cc830c009cb9376f1e5dd Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 14:15:46 +0100
Subject: [PATCH 34/50] Improved interface, environment disposal

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 16 +++++----
 .../key/api/data/KeyIdentifications.java      |  7 ++++
 .../keyproject/key/api/remoteapi/EnvApi.java  |  3 ++
 keyext.client.python/keyapi/server.py         | 35 +++++++++++++++++--
 .../keyapi/server_internal.py                 |  5 +++
 keyext.client.python/main.py                  | 33 +++++++++--------
 6 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 3a615a73e66..76e8e77c4fc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -206,12 +206,8 @@ private static void configureProofMode(Proof proof, StreategyOptions options) {
 
     @Override
     public CompletableFuture<Boolean> dispose(ProofId id) {
-        return CompletableFuture.supplyAsync(() -> {
-            var proof = data.find(id);
-            data.dispose(id);
-            proof.dispose();
-            return true;
-        });
+        data.dispose(id);
+        return CompletableFuture.completedFuture(true);
     }
 
     @Override
@@ -353,6 +349,14 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
         });
     }
 
+    @Override
+    public CompletableFuture<Boolean> dispose(EnvironmentId environmentId) {
+        data.dispose(environmentId);
+        return CompletableFuture.completedFuture(
+                true
+        );
+    }
+
     @Override
     public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options) {
         return CompletableFuture.supplyAsync(() -> {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index ea7e5d2b8a6..585a3021caf 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -61,6 +61,13 @@ public void dispose(ProofId id) {
         c.dispose();
     }
 
+    public void dispose(EnvironmentId id) {
+        var c = getContainer(id);
+        c.mapProof.forEach(((proofId, proofContainer) -> this.dispose(proofId)));
+        mapEnv.remove(id);
+        c.dispose();
+    }
+
     public Node find(NodeId nodeId) {
         @NonNull
         Proof p = find(nodeId.proofId);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index dc8fb6362c6..d860e245878 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -30,4 +30,7 @@ public interface EnvApi {
 
     @JsonRequest
     CompletableFuture<ProofId> openContract(ContractId contractId);
+
+    @JsonRequest
+    CompletableFuture<Boolean> dispose(EnvironmentId env);
 }
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
index 35263f3d571..9feef0f4d66 100644
--- a/keyext.client.python/keyapi/server.py
+++ b/keyext.client.python/keyapi/server.py
@@ -1,5 +1,5 @@
 import socket
-from keyapi import LspEndpoint, LoadParams
+from keyapi import LspEndpoint, LoadParams, StreategyOptions
 from keyapi.server_internal import KeyServer
 from keyapi.rpc import JsonRpcEndpoint
 
@@ -29,4 +29,35 @@ def __exit__(self, type, value, traceback):
         self.key.server_exit()
         self.inStream.close()
         self.outStream.close()
-        self.socket.close()
\ No newline at end of file
+        self.socket.close()
+
+class KeYEnv(object):
+    def __init__(self, key, load_params : LoadParams):
+        self.key = key
+        self.envHandle = self.key.loading_load(load_params)
+
+    def contracts(self):
+        return self.key.env_contracts(self.envHandle)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.key.env_dispose(self.envHandle)
+
+class KeYProof(object):
+    def __init__(self, key, contract):
+        self.key = key
+        self.proofHandle = self.key.env_openContract(contract.contractId)
+
+    def __enter__(self):
+        return self
+
+    def root(self):
+        return self.key.proofTree_root(self.proofHandle)
+
+    def auto(self, options = StreategyOptions()):
+        return self.key.proof_auto(self.proofHandle, options)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.key.proof_dispose(self.proofHandle)
\ No newline at end of file
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
index 388af409734..30c38f61875 100644
--- a/keyext.client.python/keyapi/server_internal.py
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -16,6 +16,11 @@ def env_contracts(self, env : EnvironmentId) -> typing.List[ContractDesc]:
 
        return self._call_sync("env/contracts", [env])
 
+    def env_dispose(self, env : EnvironmentId) -> bool:
+       """"""
+
+       return self._call_sync("env/dispose", [env])
+
     def env_functions(self, env : EnvironmentId) -> typing.List[FunctionDesc]:
        """"""
 
diff --git a/keyext.client.python/main.py b/keyext.client.python/main.py
index c69c44f9fdf..33c1077ab0e 100644
--- a/keyext.client.python/main.py
+++ b/keyext.client.python/main.py
@@ -1,6 +1,6 @@
 import socket
 from keyapi import LspEndpoint, LoadParams, StreategyOptions
-from keyapi.server import NetKeY
+from keyapi.server import NetKeY, KeYEnv, KeYProof
 from keyapi.rpc import JsonRpcEndpoint
 
 def configure_callbacks(key):
@@ -14,27 +14,26 @@ def configure_callbacks(key):
     with NetKeY(target) as key:
         print(key.meta_version())
         configure_callbacks(key)
-        envHandle = key.loading_load(
-            LoadParams("/home/samuel/Dokumente/Projects/KeY/key/key.core.example/example/IntegerUtil.java",
-                       None,
-                       None,
-                       None))
 
-        contracts = key.env_contracts(envHandle)
+        params = LoadParams("/home/samuel/Dokumente/Projects/KeY/key/key.core.example/example/IntegerUtil.java",
+       None,
+       None,
+       None)
 
-        print([c.contractId for c in contracts])
+        with KeYEnv(key, params) as env:
+            contracts = env.contracts()
 
-        proof_id = key.env_openContract(contracts[1].contractId)
+            print("Found the following contracts: ")
+            print("\n".join([("- "+str(c.contractId)) for c in contracts]))
 
-        print(proof_id.proofId)
+            i = 0
+            with KeYProof(key, contracts[i]) as proof:
+                print("Proof for contract: ", contracts[i].contractId)
 
-        print("Loading Root Node:")
-        root_node = key.proofTree_root(proof_id)
+                root = proof.root()
+                print("Root Node: ", root.name)
 
-        print("Root Node: ",root_node.name)
-
-        proof_status = key.proof_auto(proof_id, StreategyOptions())
-        print("Open goals: ", proof_status.openGoals)
-        #print("Closed goals: ", proof_status.closedGoals)
+                status = proof.auto(StreategyOptions())
+                print("Open goals: ", status.openGoals)
 
     print("Terminating")

From 1b673723584a508fec3f6524c2383a7290dfd32c Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Wed, 5 Mar 2025 23:27:31 +0100
Subject: [PATCH 35/50] spotless

---
 .../key/ui/ConsoleUserInterfaceControl.java   | 10 ++--
 .../org/key_project/key/api/doc/DocGen.java   | 24 ++++++----
 .../key/api/doc/ExtractMetaData.java          |  3 +-
 .../keyproject/key/api/GenericSerializer.java |  3 +-
 .../org/keyproject/key/api/KeyApiImpl.java    | 40 ++++++++--------
 .../org/keyproject/key/api/StartServer.java   |  4 +-
 .../key/api/adapters/KeyAdapter.java          |  2 +-
 .../keyproject/key/api/data/ProofStatus.java  |  3 ++
 .../key/api/data/TaskFinishedInfo.java        |  3 ++
 .../key/api/data/TaskStartedInfo.java         |  3 ++
 .../keyproject/key/api/data/TreeNodeDesc.java |  1 -
 .../key/api/remoteapi/ProofTreeApi.java       |  1 -
 .../key/api/remoteapi/ServerManagement.java   |  1 -
 .../kit/iti/formal/keyextclientjava/Main.java | 15 +++---
 .../formal/keyextclientjava/MyKeyClient.java  | 48 ++++++++++---------
 .../formal/keyextclientjava/rpc/JsonRPC.java  | 15 ++++--
 .../keyextclientjava/rpc/KeyRemote.java       |  6 ++-
 .../formal/keyextclientjava/rpc/RPCLayer.java | 42 +++++++++-------
 .../edu/kit/keyext/client/RPCLayerTest.java   | 18 ++++---
 .../java/edu/kit/keyext/client/Starter.java   |  7 ++-
 20 files changed, 144 insertions(+), 105 deletions(-)

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
index 6ff57934369..5bbb8e54c33 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java
@@ -179,11 +179,11 @@ public void taskFinished(TaskFinishedInfo info) {
             } else if (macroChosen()) {
                 applyMacro();
             } else {
-            try {
-                finish(proof);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+                try {
+                    finish(proof);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
             }
         }
     }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index c71335d2cf6..823d7030d4d 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -58,10 +58,10 @@ private void printHeader() {
 
     private void endpoints(Metamodel.Endpoint endpoint) {
         var direction = switch (endpoint) {
-            case Metamodel.ServerRequest sr -> "client -> server";
-            case Metamodel.ClientRequest sr -> "server -> client";
-            case Metamodel.ServerNotification sr -> "client ~~> server";
-            case Metamodel.ClientNotification sr -> "server ~~> client";
+        case Metamodel.ServerRequest sr -> "client -> server";
+        case Metamodel.ClientRequest sr -> "server -> client";
+        case Metamodel.ServerNotification sr -> "client ~~> server";
+        case Metamodel.ClientNotification sr -> "server ~~> client";
         };
 
         out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
@@ -71,12 +71,16 @@ private void endpoints(Metamodel.Endpoint endpoint) {
                 .map(it -> "%s : %s".formatted(it.name(), it.type()))
                 .collect(Collectors.joining(", "));
         switch (endpoint) {
-            case Metamodel.ServerRequest sr -> out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ClientRequest sr -> out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ServerNotification ignored -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-            case Metamodel.ClientNotification ignored -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
-            default -> {
-            }
+        case Metamodel.ServerRequest sr ->
+            out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        case Metamodel.ClientRequest sr ->
+            out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+        case Metamodel.ServerNotification ignored ->
+            out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+        case Metamodel.ClientNotification ignored ->
+            out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+        default -> {
+        }
         }
         out.format("```%n");
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 377ebea06fb..8c8c3e55fbe 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -159,7 +159,8 @@ private void addServerEndpoint(Method method) {
             return;
         }
 
-        throw new IllegalStateException("Method " + method + " is neither a request nor a notification");
+        throw new IllegalStateException(
+            "Method " + method + " is neither a request nor a notification");
     }
 
     private String findDocumentation(Method method) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
index 7fe73de010e..c835293099a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -53,7 +53,8 @@ public JsonElement serialize(Object src, Type typeOfSrc,
             JsonSerializationContext context) {
         JsonElement retValue = gson.toJsonTree(src);
         if (retValue.isJsonObject()) {
-            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getSimpleName());
+            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME,
+                src.getClass().getSimpleName());
         }
         return retValue;
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 76e8e77c4fc..d0dbcc3a20a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -182,17 +182,17 @@ public CompletableFuture<ProofStatus> auto(ProofId proofId, StreategyOptions opt
 
     private static void configureProofMode(Proof proof, StreategyOptions options) {
         StrategyProperties sp =
-                proof.getSettings().getStrategySettings().getActiveStrategyProperties();
+            proof.getSettings().getStrategySettings().getActiveStrategyProperties();
         sp.setProperty(StrategyProperties.METHOD_OPTIONS_KEY,
-                StrategyProperties.METHOD_CONTRACT);
+            StrategyProperties.METHOD_CONTRACT);
         sp.setProperty(StrategyProperties.DEP_OPTIONS_KEY,
-                StrategyProperties.DEP_ON);
+            StrategyProperties.DEP_ON);
         sp.setProperty(StrategyProperties.QUERY_OPTIONS_KEY,
-                StrategyProperties.QUERY_ON);
+            StrategyProperties.QUERY_ON);
         sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY,
-                StrategyProperties.NON_LIN_ARITH_DEF_OPS);
+            StrategyProperties.NON_LIN_ARITH_DEF_OPS);
         sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY,
-                StrategyProperties.STOPMODE_NONCLOSE);
+            StrategyProperties.STOPMODE_NONCLOSE);
         proof.getSettings().getStrategySettings().setActiveStrategyProperties(sp);
         // Make sure that the new options are used
         int maxSteps = 10000;
@@ -276,19 +276,20 @@ public CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId) {
         return null;
     }
 
-    /*@Override
-    public CompletableFuture<Statistics> statistics(ProofId proofId) {
-        return CompletableFuture.supplyAsync(() -> {
-            var proof = data.find(proofId);
-            return proof.getStatistics();
-        });
-    }*/
+    /*
+     * @Override
+     * public CompletableFuture<Statistics> statistics(ProofId proofId) {
+     * return CompletableFuture.supplyAsync(() -> {
+     * var proof = data.find(proofId);
+     * return proof.getStatistics();
+     * });
+     * }
+     */
 
     @Override
     public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
         return CompletableFuture.completedFuture(
-                TreeNodeDesc.from(proof, data.find(proof).root())
-        );
+            TreeNodeDesc.from(proof, data.find(proof).root()));
     }
 
     @Override
@@ -335,7 +336,9 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
             var env = data.find(contractId.envId());
             var contracts = env.getAvailableContracts();
             var contract =
-                contracts.stream().filter(it -> Objects.equals(it.getName(),contractId.contractId())).findFirst();
+                contracts.stream()
+                        .filter(it -> Objects.equals(it.getName(), contractId.contractId()))
+                        .findFirst();
             if (contract.isPresent()) {
                 try {
                     var proof = env.createProof(contract.get().createProofObl(env.getInitConfig()));
@@ -353,8 +356,7 @@ public CompletableFuture<ProofId> openContract(ContractId contractId) {
     public CompletableFuture<Boolean> dispose(EnvironmentId environmentId) {
         data.dispose(environmentId);
         return CompletableFuture.completedFuture(
-                true
-        );
+            true);
     }
 
     @Override
@@ -387,7 +389,7 @@ public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int p
             var pis = nodeText.table().getPosInSequent(pos, filter);
             return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis,
                 goal)
-                        .getActions();
+                    .getActions();
         });
 
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 3f0fbe54c9a..8b902318287 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -182,7 +182,7 @@ public Boolean apply(Void unused) {
                             return StartServer.this.shutdownHandler();
                         }
                     });
-                    //listener.startListening().get();
+                    // listener.startListening().get();
                     listenerFuture = listener.startListening();
                     try {
                         listenerFuture.get();
@@ -209,7 +209,7 @@ public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyAp
         var launcherBuilder = new Launcher.Builder<ClientApi>()
                 .setOutput(out)
                 .setInput(in)
-                //.traceMessages(new PrintWriter(System.err))
+                // .traceMessages(new PrintWriter(System.err))
                 .validateMessages(true);
 
         launcherBuilder.configureGson(StartServer::configureJson);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
index 8b8ed4ee988..414cc332e5d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -7,13 +7,13 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 
-import com.google.gson.stream.JsonToken;
 import de.uka.ilkd.key.macros.ProofMacro;
 
 import org.key_project.logic.op.Function;
 
 import com.google.gson.*;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import org.keyproject.key.api.data.MacroDescription;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
index 195d3e280de..b18fee870d2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.proof.Proof;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
index bf22f392105..9ecacd52b0a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 public record TaskFinishedInfo() {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index e0f159b2224..31a230c41c8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 public record TaskStartedInfo() {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index ef47a069c78..b116c863557 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -5,7 +5,6 @@
 
 import de.uka.ilkd.key.proof.Node;
 
-import javax.swing.tree.TreeNode;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index 57f9ed59f98..cd4aa88b146 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.antlr.runtime.tree.Tree;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.KeyIdentifications.ProofId;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index 05ee6efe619..bcbff9a04ff 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -4,7 +4,6 @@
 package org.keyproject.key.api.remoteapi;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
index 3ec4af718b7..1fb11b468d7 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
@@ -1,17 +1,13 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.iti.formal.keyextclientjava;
 
+import java.io.IOException;
 import javafx.application.Application;
-import javafx.geometry.Orientation;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
-import javafx.scene.layout.BorderPane;
-import javafx.stage.FileChooser;
 import javafx.stage.Stage;
-import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
-import org.kordamp.ikonli.javafx.FontIcon;
-
-import java.io.IOException;
-import java.util.concurrent.ForkJoinPool;
 
 public class Main {
     public static class HelloApplication extends Application {
@@ -24,7 +20,8 @@ public void start(Stage stage) throws IOException {
         }
 
     }
+
     public static void main(String[] args) {
         Application.launch(HelloApplication.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 669b1c371f7..39d87aec8f7 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -1,14 +1,28 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.iti.formal.keyextclientjava;
 
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.geometry.Orientation;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.stage.FileChooser;
+
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
+
 import edu.kit.iti.formal.keyextclientjava.rpc.KeyRemote;
 import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
-import javafx.geometry.Orientation;
-import javafx.scene.control.*;
-import javafx.scene.layout.BorderPane;
-import javafx.stage.FileChooser;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
 import org.keyproject.key.api.KeyApiImpl;
@@ -21,16 +35,6 @@
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;
 
-import java.io.IOException;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 public class MyKeyClient {
     public static final String JAR_FILE = "";
     private final ToolBar toolbar = new ToolBar();
@@ -44,11 +48,11 @@ public class MyKeyClient {
     private KeyIdentifications.ProofId loadedProof;
 
     public MyKeyClient() throws IOException {
-        //region toolbar
+        // region toolbar
         var btnOpen = new Button("Open", new FontIcon(FontAwesomeRegular.FOLDER_OPEN));
         btnOpen.setOnAction(actionEvent -> openFile());
         toolbar.getItems().setAll(btnOpen, new Separator(Orientation.VERTICAL));
-        //endregion
+        // endregion
 
         var splitCenter = new SplitPane(tnid, txtSequentView);
         splitCenter.setDividerPositions(.2);
@@ -56,7 +60,7 @@ public MyKeyClient() throws IOException {
         root.setCenter(splitCenter);
         root.setBottom(txtStatus);
 
-        //var startKey = ForkJoinPool.commonPool().submit(this::startKey);
+        // var startKey = ForkJoinPool.commonPool().submit(this::startKey);
 
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
@@ -98,12 +102,12 @@ private void openFile() {
         if (sel != null) {
             try {
                 loadedProof = keyApi.load(
-                        new LoadParams(sel, null, null, null, null))
+                    new LoadParams(sel, null, null, null, null))
                         .get().getRight();
                 var root = keyApi.root(loadedProof).get();
-                var sequent
-                        = keyApi.print(root.nodeid(), new PrintOptions(true, 80, 4, true, false))
-                        .get();
+                var sequent =
+                    keyApi.print(root.nodeid(), new PrintOptions(true, 80, 4, true, false))
+                            .get();
                 txtSequentView.setText(sequent.result());
             } catch (ProblemLoaderException e) {
                 throw new RuntimeException(e);
@@ -117,7 +121,7 @@ private void openFile() {
         }
     }
 
-    private class SimpleClient implements ClientApi{
+    private class SimpleClient implements ClientApi {
         @Override
         public void sayHello(String e) {
 
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
index 820236976b4..adb642c758c 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.iti.formal.keyextclientjava.rpc;
 
 import com.google.gson.Gson;
@@ -40,11 +43,13 @@ public static String createResponse(String id, Object result) {
         return createResponse(id, gson.toJsonTree(result), null);
     }
 
-    public static String createErrorReponse(String id, int code, String message, @Nullable Object data) {
+    public static String createErrorReponse(String id, int code, String message,
+            @Nullable Object data) {
         return createResponse(id, null, createError(code, message, data));
     }
 
-    public static String createResponse(String id, @Nullable JsonElement result, @Nullable JsonObject error) {
+    public static String createResponse(String id, @Nullable JsonElement result,
+            @Nullable JsonObject error) {
         if (result != null && error != null) {
             throw new IllegalArgumentException("result and error at the same time is invalid");
         }
@@ -69,7 +74,8 @@ public static String createResponse(String id, @Nullable JsonElement result, @Nu
 
     /**
      * 5.1 Error object
-     * When a rpc call encounters an error, the Response Object MUST contain the error member with a value that is a Object with the following members:
+     * When a rpc call encounters an error, the Response Object MUST contain the error member with a
+     * value that is a Object with the following members:
      * <p>
      * code
      * A Number that indicates the error type that occurred.
@@ -80,7 +86,8 @@ public static String createResponse(String id, @Nullable JsonElement result, @Nu
      * data
      * A Primitive or Structured value that contains additional information about the error.
      * This may be omitted.
-     * The value of this member is defined by the Server (e.g. detailed error information, nested errors etc.).
+     * The value of this member is defined by the Server (e.g. detailed error information, nested
+     * errors etc.).
      *
      * @return
      */
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
index 966f7747cff..71c49088273 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
@@ -1,6 +1,8 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.iti.formal.keyextclientjava.rpc;
 
-import com.google.gson.JsonObject;
 
 /**
  * @author Alexander Weigl
@@ -17,4 +19,4 @@ public String meta_version() {
         final var obj = layer.callSync("meta/version");
         return obj.get("result").getAsString();
     }
-}
\ No newline at end of file
+}
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
index 76d75509b1f..569b8a091f9 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
@@ -1,15 +1,16 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.iti.formal.keyextclientjava.rpc;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.jspecify.annotations.Nullable;
-
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.jspecify.annotations.Nullable;
+
 /**
  * @author Alexander Weigl
  * @version 1 (22.11.24)
@@ -83,7 +84,8 @@ private void sendAsync(String id, String methodName, Object[] args) throws IOExc
     }
 
     public void start() {
-        threadListener = new Thread(new JsonStreamListener(incoming, incomingMessages), "JSON Message Reader");
+        threadListener =
+            new Thread(new JsonStreamListener(incoming, incomingMessages), "JSON Message Reader");
         threadMessageHandling = new Thread(this::handler, "JSON Message Handler");
         threadListener.start();
         threadMessageHandling.start();
@@ -101,7 +103,7 @@ private void handler() {
                     var syncObj = waiting.get(id);
                     syncObj.put(obj);
                 } else {
-                    //TODO handle notification
+                    // TODO handle notification
                     System.out.println("Notification received");
                     System.out.println(obj);
                 }
@@ -135,7 +137,8 @@ public void run() {
             try {
                 while (true) {
                     final var message = readMessage();
-                    if (message == null) break;
+                    if (message == null)
+                        break;
                     final var jsonObject = JsonParser.parseString(message).getAsJsonObject();
                     incomingMessageQueue.add(jsonObject);
                 }
@@ -151,13 +154,13 @@ protected void processIncomingMessage(String message) {
 
         public @Nullable String readMessage() throws IOException {
             expectedContentLength();
-            final var len = readLength() + 2; //also read \r\n,
+            final var len = readLength() + 2; // also read \r\n,
 
             if (len == 2) {// EOF reached
                 return null;
             }
 
-            if (buf.length <= len) { //reallocate more if necessary
+            if (buf.length <= len) { // reallocate more if necessary
                 buf = new char[len];
             }
 
@@ -172,9 +175,11 @@ private int readLength() throws IOException {
             int len = 0;
             do {
                 c = incoming.read();
-                //if (Character.isWhitespace(c)) continue;
-                if (c == -1) return 0;
-                if (c == '\r' || c == '\n') break;
+                // if (Character.isWhitespace(c)) continue;
+                if (c == -1)
+                    return 0;
+                if (c == '\r' || c == '\n')
+                    break;
                 if (Character.isDigit(c)) {
                     len = len * 10 + c - '0';
                 } else {
@@ -189,7 +194,8 @@ private int readLength() throws IOException {
         private void expectedContentLength() throws IOException {
             for (var e : CLENGTH) {
                 int c = incoming.read();
-                if (c == -1) return;
+                if (c == -1)
+                    return;
                 if (e != c) {
                     throw new IllegalStateException("Expected: '%c', but got '%c'".formatted(e, c));
                 }
@@ -208,6 +214,7 @@ private void consumeCRNL() throws IOException {
     }
 }
 
+
 class SimpleFuture implements Future<JsonObject> {
     private final CountDownLatch latch = new CountDownLatch(1);
     private JsonObject value;
@@ -234,7 +241,8 @@ public JsonObject get() throws InterruptedException, ExecutionException {
     }
 
     @Override
-    public JsonObject get(long timeout, TimeUnit unit) throws InterruptedException, TimeoutException {
+    public JsonObject get(long timeout, TimeUnit unit)
+            throws InterruptedException, TimeoutException {
         if (latch.await(timeout, unit)) {
             return value;
         } else {
@@ -247,4 +255,4 @@ void put(JsonObject value) {
         latch.countDown();
     }
 
-}
\ No newline at end of file
+}
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
index f6195ae8a8f..2cd48bded4d 100644
--- a/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
@@ -1,15 +1,18 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.keyext.client;
 
-import edu.kit.iti.formal.keyextclientjava.rpc.JsonRPC;
-import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.concurrent.ArrayBlockingQueue;
 
+import edu.kit.iti.formal.keyextclientjava.rpc.JsonRPC;
+import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 /**
  * @author Alexander Weigl
  * @version 1 (24.11.24)
@@ -33,7 +36,8 @@ void testIncoming() throws IOException {
         var response = JsonRPC.createResponse("1", 2);
         final var incoming = new StringReader(JsonRPC.addHeader(notification) +
                 JsonRPC.addHeader(response));
-        RPCLayer.JsonStreamListener listener = new RPCLayer.JsonStreamListener(incoming, new ArrayBlockingQueue<>(1));
+        RPCLayer.JsonStreamListener listener =
+            new RPCLayer.JsonStreamListener(incoming, new ArrayBlockingQueue<>(1));
         String first = listener.readMessage();
         Assertions.assertEquals(notification, first);
         String second = listener.readMessage();
@@ -50,4 +54,4 @@ void testLockingAndReleasing() throws IOException, InterruptedException {
         var result = layer.callSync("calc", 1, 1);
         System.out.println(result);
     }
-}
\ No newline at end of file
+}
diff --git a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
index 9a606fe2e33..9eeb893e163 100644
--- a/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
@@ -1,11 +1,14 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package edu.kit.keyext.client;
 
+import java.io.IOException;
+
 import edu.kit.iti.formal.keyextclientjava.rpc.KeyRemote;
 import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 /**
  * @author Alexander Weigl
  * @version 1 (24.11.24)

From 0b91b9cede4e4bec3bab574558aaa2ff8b510126 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 16:28:18 +0100
Subject: [PATCH 36/50] Fixed JSON type annotation&retrieval

---
 .../keyproject/key/api/GenericSerializer.java |  61 -------
 .../RuntimeClassNameTypeAdapterFactory.java   | 149 ++++++++++++++++++
 .../org/keyproject/key/api/StartServer.java   |   3 +-
 .../keyproject/key/api/data/ContractDesc.java |   2 +-
 .../keyproject/key/api/data/FunctionDesc.java |   2 +-
 .../key/api/data/KeYDataTransferObject.java   |   4 +
 .../key/api/data/KeyIdentifications.java      |  14 +-
 .../keyproject/key/api/data/LoadParams.java   |   2 +-
 .../key/api/data/MacroDescription.java        |   2 +-
 .../key/api/data/MacroStatistic.java          |   2 +-
 .../org/keyproject/key/api/data/NodeDesc.java |   2 +-
 .../keyproject/key/api/data/NodeTextDesc.java |   2 +-
 .../key/api/data/PredicateDesc.java           |   2 +-
 .../key/api/data/ProblemDefinition.java       |   2 +-
 .../key/api/data/ProofMacroDesc.java          |   2 +-
 .../key/api/data/ProofScriptCommandDesc.java  |   2 +-
 .../keyproject/key/api/data/ProofStatus.java  |   2 +-
 .../org/keyproject/key/api/data/SortDesc.java |   2 +-
 .../key/api/data/StreategyOptions.java        |   2 +-
 .../key/api/data/TaskFinishedInfo.java        |   2 +-
 .../key/api/data/TaskStartedInfo.java         |   2 +-
 .../key/api/data/TermActionDesc.java          |   2 +-
 .../key/api/data/TermActionKind.java          |   2 +-
 .../keyproject/key/api/data/TraceValue.java   |   2 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |   2 +-
 25 files changed, 182 insertions(+), 89 deletions(-)
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
deleted file mode 100644
index 7fe73de010e..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api;
-
-import java.lang.reflect.Type;
-
-import com.google.gson.*;
-
-/**
- * <a href=
- * "https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type">Stackoverflow
- * post</a>
- */
-public class GenericSerializer implements JsonSerializer<Object> /* , JsonDeserializer<Object> */ {
-
-    private static final String CLASS_PROPERTY_NAME = "$class";
-    private final Gson gson;
-
-    public GenericSerializer() {
-        gson = new Gson();
-    }
-
-    public GenericSerializer(Gson gson) {
-        this.gson = gson;
-    }
-
-    /*
-     * @Override
-     * public Object deserialize(JsonElement json, Type typeOfT,
-     * JsonDeserializationContext context) throws JsonParseException {
-     *
-     * Class<?> actualClass;
-     * if (json.isJsonObject()) {
-     * JsonObject jsonObject = json.getAsJsonObject();
-     * String className = jsonObject.get(CLASS_PROPERTY_NAME).getAsString();
-     * try {
-     * actualClass = Class.forName(className);
-     * } catch (ClassNotFoundException e) {
-     * e.printStackTrace();
-     * throw new JsonParseException(e.getMessage());
-     * }
-     * } else {
-     * actualClass = typeOfT.getClass();
-     * }
-     *
-     * return gson.fromJson(json, actualClass);
-     * }
-     */
-
-    @Override
-    public JsonElement serialize(Object src, Type typeOfSrc,
-            JsonSerializationContext context) {
-        JsonElement retValue = gson.toJsonTree(src);
-        if (retValue.isJsonObject()) {
-            retValue.getAsJsonObject().addProperty(CLASS_PROPERTY_NAME, src.getClass().getSimpleName());
-        }
-        return retValue;
-    }
-
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
new file mode 100644
index 00000000000..4e981fa17e9
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
@@ -0,0 +1,149 @@
+package org.keyproject.key.api;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal.Streams;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import org.keyproject.key.api.data.KeYDataTransferObject;
+
+/*
+Taken & Modified from
+https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type
+ */
+
+public final class RuntimeClassNameTypeAdapterFactory<T> implements TypeAdapterFactory {
+    private final Class<?> baseType;
+    private final String typeFieldName;
+    private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<String, Class<?>>();
+    private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<Class<?>, String>();
+
+    private RuntimeClassNameTypeAdapterFactory(Class<?> baseType, String typeFieldName) {
+        if (typeFieldName == null || baseType == null) {
+            throw new NullPointerException();
+        }
+        this.baseType = baseType;
+        this.typeFieldName = typeFieldName;
+    }
+
+    /**
+     * Creates a new runtime type adapter using for {@code baseType} using {@code
+     * typeFieldName} as the type field name. Type field names are case sensitive.
+     */
+    public static <T> RuntimeClassNameTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
+        return new RuntimeClassNameTypeAdapterFactory<T>(baseType, typeFieldName);
+    }
+
+    /**
+     * Creates a new runtime type adapter for {@code baseType} using {@code "type"} as
+     * the type field name.
+     */
+    public static <T> RuntimeClassNameTypeAdapterFactory<T> of(Class<T> baseType) {
+        return new RuntimeClassNameTypeAdapterFactory<T>(baseType, "class");
+    }
+
+    /**
+     * Registers {@code type} identified by {@code label}. Labels are case
+     * sensitive.
+     *
+     * @throws IllegalArgumentException if either {@code type} or {@code label}
+     *     have already been registered on this type adapter.
+     */
+    public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T> type, String label) {
+        if (type == null || label == null) {
+            throw new NullPointerException();
+        }
+        if (subtypeToLabel.containsKey(type) || labelToSubtype.containsKey(label)) {
+            throw new IllegalArgumentException("types and labels must be unique");
+        }
+        labelToSubtype.put(label, type);
+        subtypeToLabel.put(type, label);
+        return this;
+    }
+
+    /**
+     * Registers {@code type} identified by its {@link Class#getSimpleName simple
+     * name}. Labels are case sensitive.
+     *
+     * @throws IllegalArgumentException if either {@code type} or its simple name
+     *     have already been registered on this type adapter.
+     */
+    public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T> type) {
+        return registerSubtype(type, type.getSimpleName());
+    }
+
+    public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
+
+        if (!KeYDataTransferObject.class.isAssignableFrom(type.getRawType())){
+            return null;
+        }
+
+        final Map<String, TypeAdapter<?>> labelToDelegate
+                = new LinkedHashMap<String, TypeAdapter<?>>();
+        final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
+                = new LinkedHashMap<Class<?>, TypeAdapter<?>>();
+
+        if(Object.class.isAssignableFrom(type.getRawType()) ) {
+            TypeAdapter<?> delegate = gson.getDelegateAdapter(this, type);
+            // Modified: What is type.getRawType().getName() now was "class" before
+            labelToDelegate.put(type.getRawType().getName(), delegate);
+            subtypeToDelegate.put(type.getRawType(), delegate);
+        }
+
+        return new TypeAdapter<R>() {
+            @Override public R read(JsonReader in) throws IOException {
+                JsonElement jsonElement = Streams.parse(in);
+                JsonElement labelJsonElement = jsonElement.getAsJsonObject().remove(typeFieldName);
+                if (labelJsonElement == null) {
+                    throw new JsonParseException("cannot deserialize " + baseType
+                            + " because it does not define a field named " + typeFieldName);
+                }
+                String label = labelJsonElement.getAsString();
+                @SuppressWarnings("unchecked") // registration requires that subtype extends T
+                TypeAdapter<R> delegate = (TypeAdapter<R>) labelToDelegate.get(label);
+                if (delegate == null) {
+                    throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
+                            + label + "; did you forget to register a subtype?");
+                }
+                return delegate.fromJsonTree(jsonElement);
+            }
+
+            @Override public void write(JsonWriter out, R value) throws IOException {
+                Class<?> srcType = value.getClass();
+                String label = srcType.getName();
+                @SuppressWarnings("unchecked") // registration requires that subtype extends T
+                TypeAdapter<R> delegate = (TypeAdapter<R>) subtypeToDelegate.get(srcType);
+                if (delegate == null) {
+                    throw new JsonParseException("cannot serialize " + srcType.getName()
+                            + "; did you forget to register a subtype?");
+                }
+                JsonElement jsonTree = delegate.toJsonTree(value);
+                if(jsonTree.isJsonPrimitive()) {
+                    Streams.write(jsonTree, out);
+                } else {
+                    JsonObject jsonObject = jsonTree.getAsJsonObject();
+                    if (jsonObject.has(typeFieldName)) {
+                        throw new JsonParseException("cannot serialize " + srcType.getName()
+                                + " because it already defines a field named " + typeFieldName);
+                    }
+                    JsonObject clone = new JsonObject();
+                    clone.add(typeFieldName, new JsonPrimitive(label));
+                    for (Map.Entry<String, JsonElement> e : jsonObject.entrySet()) {
+                        clone.add(e.getKey(), e.getValue());
+                    }
+                    Streams.write(clone, out);
+                }
+            }
+        }.nullSafe();
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 3f0fbe54c9a..621c1add875 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -18,6 +18,7 @@
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
 import org.keyproject.key.api.adapters.KeyAdapter;
+import org.keyproject.key.api.data.KeYDataTransferObject;
 import org.keyproject.key.api.remoteclient.ClientApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -200,7 +201,7 @@ public Boolean apply(Void unused) {
     public static void configureJson(GsonBuilder gsonBuilder) {
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
         gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
-        gsonBuilder.registerTypeHierarchyAdapter(Object.class, new GenericSerializer());
+        gsonBuilder.registerTypeAdapterFactory(RuntimeClassNameTypeAdapterFactory.of(Object.class, "$class"));
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index e3b38ae96df..b577fb4c212 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -11,7 +11,7 @@
  * @version 1 (13.10.23)
  */
 public record ContractDesc(KeyIdentifications.ContractId contractId, String name, String displayName,
-                           String typeName, String htmlText, String plainText) {
+                           String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
     public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services, Contract it) {
         return new ContractDesc(new KeyIdentifications.ContractId(envId, it.getName()),
                 it.getName(), it.getDisplayName(), it.getTypeName(),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index d664c5a3981..4d851f298bd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -13,7 +13,7 @@
  * @version 1 (15.10.23)
  */
 public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts, boolean rigid,
-                           boolean unique, boolean skolemConstant) {
+                           boolean unique, boolean skolemConstant) implements KeYDataTransferObject {
     public static FunctionDesc from(Function fn) {
         return new FunctionDesc(fn.name().toString(), fn.sort().declarationString(),
                 SortDesc.from(fn.sort()),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
new file mode 100644
index 00000000000..a9841b17a27
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
@@ -0,0 +1,4 @@
+package org.keyproject.key.api.data;
+
+public interface KeYDataTransferObject {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 585a3021caf..5ce36373e59 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -102,31 +102,31 @@ public ProofId register(ProofId proofId, Proof proof) {
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record EnvironmentId(String envId) {
+    public record EnvironmentId(String envId) implements KeYDataTransferObject {
     }
 
     /**
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record ContractId(EnvironmentId envId, String contractId) {
+    public record ContractId(EnvironmentId envId, String contractId) implements KeYDataTransferObject {
     }
 
     /**
      * @author Alexander Weigl
      * @version 1 (29.10.23)
      */
-    public record NodeId(ProofId proofId, int nodeId) {
+    public record NodeId(ProofId proofId, int nodeId) implements KeYDataTransferObject {
     }
 
-    public record ProofId(EnvironmentId env, String proofId) {
+    public record ProofId(EnvironmentId env, String proofId) implements KeYDataTransferObject {
     }
 
     /**
      * @author Alexander Weigl
      * @version 1 (29.10.23)
      */
-    public record NodeTextId(NodeId nodeId, int nodeTextId) {
+    public record NodeTextId(NodeId nodeId, int nodeTextId) implements KeYDataTransferObject {
     }
 
 
@@ -134,14 +134,14 @@ public record NodeTextId(NodeId nodeId, int nodeTextId) {
      * @author Alexander Weigl
      * @version 1 (13.10.23)
      */
-    public record TermActionId(NodeId nodeId, String pio, String id) {
+    public record TermActionId(NodeId nodeId, String pio, String id) implements KeYDataTransferObject {
     }
 
     /**
      * @author Alexander Weigl
      * @version 1 (13.10.23)
      */
-    public record TreeNodeId(String id) {
+    public record TreeNodeId(String id) implements KeYDataTransferObject {
     }
 
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 8a337d62b65..99ee1cad8bf 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -14,4 +14,4 @@
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(File problemFile, List<File> classPath, File bootClassPath, List<File> includes) {}
+public record LoadParams(File problemFile, List<File> classPath, File bootClassPath, List<File> includes) implements KeYDataTransferObject {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index fc2a8ba0e95..35ae69e98b1 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -11,7 +11,7 @@
  * @param description
  * @param category
  */
-public record MacroDescription(String name, String description, String category) {
+public record MacroDescription(String name, String description, String category) implements KeYDataTransferObject {
     public static MacroDescription from(ProofMacro m) {
         return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index 6825f99a90c..28d782c4033 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -10,7 +10,7 @@
  * @version 1 (13.10.23)
  */
 public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, int appliedRules,
-                             int closedGoals) {
+                             int closedGoals) implements KeYDataTransferObject {
     public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
         return new MacroStatistic(proofId, info.getMacro().getName(), info.getAppliedRules(), info.getClosedGoals());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index cd306e53816..b19bd883267 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -15,7 +15,7 @@ public record NodeDesc(KeyIdentifications.NodeId nodeid,
                        String branchLabel,
                        boolean scriptRuleApplication,
                        @Nullable List<NodeDesc> children
-) {
+) implements KeYDataTransferObject {
     public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication) {
         this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null);
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
index df4eb11f82f..fdb7d2d0e87 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -8,5 +8,5 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result)  {
+public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result) implements KeYDataTransferObject  {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
index dbb0e899496..bc3a20ef0b9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -7,5 +7,5 @@
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record PredicateDesc(String name, String[] argSorts) {
+public record PredicateDesc(String name, String[] argSorts) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index be69d976fc7..7ac7ba933f8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -18,5 +18,5 @@ public record ProblemDefinition(
         @Nullable List<PredicateDesc> predicates,
         @Nullable List<String> antecTerms,
         @Nullable List<String> succTerms
-) {
+) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
index f1faea9cf12..e1a57f2af26 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -9,7 +9,7 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record ProofMacroDesc(String name, String category, String description, String scriptCommandName) {
+public record ProofMacroDesc(String name, String category, String description, String scriptCommandName) implements KeYDataTransferObject {
     public static ProofMacroDesc from(ProofMacro proofMacro) {
         return new ProofMacroDesc(proofMacro.getName(), proofMacro.getCategory(),
                 proofMacro.getDescription(), proofMacro.getScriptCommandName());
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index 0f086d8f936..0ba1f9ac2d1 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -9,7 +9,7 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record ProofScriptCommandDesc() {
+public record ProofScriptCommandDesc() implements KeYDataTransferObject {
     public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
         return null;
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
index 195d3e280de..8beb029e2d4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -2,7 +2,7 @@
 
 import de.uka.ilkd.key.proof.Proof;
 
-public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals) {
+public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals) implements KeYDataTransferObject {
     public static ProofStatus from(KeyIdentifications.ProofId id, Proof proof) {
         return new ProofStatus(id, proof.openGoals().size(), proof.closedGoals().size());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index 587803ac2e6..6048b2803e2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -13,7 +13,7 @@
  */
 public record SortDesc(String string, String documentation,
                        List<SortDesc> extendsSorts,
-                       boolean anAbstract, String s) {
+                       boolean anAbstract, String s) implements KeYDataTransferObject {
     public static SortDesc from(Sort sort) {
         return new SortDesc(sort.name().toString(), sort.getDocumentation(),
                 sort.extendsSorts().stream().map(SortDesc::from).toList(),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
index ea804f0562b..cbe1f4c269d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -7,5 +7,5 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record StreategyOptions() {
+public record StreategyOptions() implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
index bf22f392105..642e474ce61 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -1,6 +1,6 @@
 package org.keyproject.key.api.data;
 
-public record TaskFinishedInfo() {
+public record TaskFinishedInfo() implements KeYDataTransferObject {
     public static TaskFinishedInfo from(de.uka.ilkd.key.prover.TaskFinishedInfo info) {
         return new TaskFinishedInfo();
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index e0f159b2224..94ebec9d855 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -1,6 +1,6 @@
 package org.keyproject.key.api.data;
 
-public record TaskStartedInfo() {
+public record TaskStartedInfo() implements KeYDataTransferObject {
     public static TaskStartedInfo from(de.uka.ilkd.key.prover.TaskStartedInfo info) {
         return new TaskStartedInfo();
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
index 1b4184e58dd..6ac41ee5926 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -31,5 +31,5 @@ public record TermActionDesc(
         /**
          * Kind of the action
          */
-        TermActionKind kind) {
+        TermActionKind kind) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
index 0a371aa48e4..83ace2343de 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -7,6 +7,6 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public enum TermActionKind {
+public enum TermActionKind implements KeYDataTransferObject {
     BuiltIn, Script, Macro, Taclet
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index 99a258f79d4..b030d4808f2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public enum TraceValue {
+public enum TraceValue implements KeYDataTransferObject {
     Off, Message, All;
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index ef47a069c78..2e89d352a5a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -11,7 +11,7 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record TreeNodeDesc(KeyIdentifications.NodeId id, String name) {
+public record TreeNodeDesc(KeyIdentifications.NodeId id, String name) implements KeYDataTransferObject {
     public static TreeNodeDesc from(KeyIdentifications.ProofId proofId, Node root) {
         return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, root.serialNr()), root.name());
     }

From b77753c35bbaa31bbbcf18f384bc026282dd3977 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 16:28:55 +0100
Subject: [PATCH 37/50] Updated json type annotation on codegen/python side

---
 .../key/api/doc/ExtractMetaData.java          |  4 +--
 .../key_project/key/api/doc/Metamodel.java    | 35 +++++++++++++++----
 .../key/api/doc/PythonGenerator.java          |  6 +++-
 keyext.client.python/keyapi/keydata.py        | 18 +++++-----
 keyext.client.python/keyapi/rpc.py            |  5 +--
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 377ebea06fb..9697dd3518b 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -229,12 +229,12 @@ private Metamodel.Type getOrFindType(Class<?> type) {
     private Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum())
-            return new Metamodel.EnumType(type.getSimpleName(),
+            return new Metamodel.EnumType(type.getSimpleName(), type.getName(),
                 Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
                 documentation);
 
 
-        var obj = new Metamodel.ObjectType(type.getSimpleName(), new ArrayList<>(), documentation);
+        var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(), documentation);
         final var list = Arrays.stream(type.getDeclaredFields())
                 .map(it -> new Metamodel.Field(it.getName(), getOrFindType(it.getType()).name()))
                 .toList();
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index d71d2c62b30..38c2e8cdfc4 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -64,12 +64,14 @@ record Field(String name, /*Type*/ String type, String documentation) {
 
 interface Type {
     default String kind() {
-            return getClass().getSimpleName();
+            return getClass().getName();
         }
 
     String documentation();
 
     String name();
+
+    String identifier();
 }
 
 
@@ -81,8 +83,12 @@ public String documentation() {
         return "built-in data type";
     }
 
+    public String identifier() {
+        return name().toLowerCase();
     }
 
+}
+
     record ListType(Type type, String documentation) implements Type {
 
     @Override
@@ -90,15 +96,22 @@ public String name() {
         return type().name() + "[]";
     }
 
+    public String identifier() {
+        return type().identifier()+"[]";
     }
 
-    record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
-
-    @Override
-    public String name() {
-        return typeName;
     }
 
+    record ObjectType(String typeName, String typeFullName, List<Field> fields, String documentation) implements Type {
+
+        @Override
+        public String name() {
+            return typeName;
+        }
+
+        public String identifier() {
+            return typeFullName;
+        }
     }
 
     public record EitherType(Type a, Type b, String documentation) implements Type {
@@ -108,12 +121,20 @@ public String name() {
         return "either<a,b>";
     }
 
+    public String identifier() {
+        return name();
     }
 
-    public record EnumType(String typeName, List<String> values, String documentation) implements Type {
+    }
+
+    public record EnumType(String typeName, String typeFullName, List<String> values, String documentation) implements Type {
 
     @Override
     public String name() {
         return typeName;
     }
+
+    public String identifier(){
+        return typeFullName;
+    }
 }}
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 616372e5af5..2aab6246178 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -200,9 +200,13 @@ protected void run() {
             metamodel.types().forEach(this::printType);
 
             var names =
-                metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.name(), it.name()))
+                metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.identifier(), it.name()))
                         .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
+            var names_reverse =
+                    metamodel.types().stream().map(it -> "\"%s\": \"%s\"".formatted(it.name(), it.identifier()))
+                            .collect(Collectors.joining(","));
+            out.format("KEY_DATA_CLASSES_REV = { %s }%n%n", names_reverse);
         }
 
         private void printType(Metamodel.Type type) {
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index e59e79cb9bb..35e2e3a46a1 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -17,6 +17,13 @@ def __init__(self, name, description):
         self.name = name
         self.description = description
 
+class ProofScriptCommandDesc:
+    """"""
+
+    def __init__(self, ):
+        pass
+
+
 class ProofMacroDesc:
     """"""
 
@@ -38,13 +45,6 @@ def __init__(self, name, category, description, scriptCommandName):
         self.description = description
         self.scriptCommandName = scriptCommandName
 
-class ProofScriptCommandDesc:
-    """"""
-
-    def __init__(self, ):
-        pass
-
-
 class TraceValue(enum.Enum):
     """"""
 
@@ -557,5 +557,7 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = { "ExampleDesc": ExampleDesc,"ProofMacroDesc": ProofMacroDesc,"ProofScriptCommandDesc": ProofScriptCommandDesc,"TraceValue": TraceValue,"SetTraceParams": SetTraceParams,"EnvironmentId": EnvironmentId,"ProofId": ProofId,"NodeId": NodeId,"List": List,"NodeDesc": NodeDesc,"StreategyOptions": StreategyOptions,"MacroStatistic": MacroStatistic,"ProofStatus": ProofStatus,"TreeNodeDesc": TreeNodeDesc,"TreeNodeId": TreeNodeId,"PrintOptions": PrintOptions,"NodeTextId": NodeTextId,"NodeTextDesc": NodeTextDesc,"TermActionId": TermActionId,"TermActionKind": TermActionKind,"TermActionDesc": TermActionDesc,"SortDesc": SortDesc,"FunctionDesc": FunctionDesc,"ContractId": ContractId,"ContractDesc": ContractDesc,"LoadParams": LoadParams,"ProblemDefinition": ProblemDefinition,"LogTraceParams": LogTraceParams,"MessageType": MessageType,"ShowMessageParams": ShowMessageParams,"ShowMessageRequestParams": ShowMessageRequestParams,"MessageActionItem": MessageActionItem,"Range": Range,"ShowDocumentParams": ShowDocumentParams,"ShowDocumentResult": ShowDocumentResult,"TaskFinishedInfo": TaskFinishedInfo,"TaskStartedInfo": TaskStartedInfo }
+KEY_DATA_CLASSES = { "org.keyproject.key.api.remoteapi.ExampleDesc": ExampleDesc,"org.keyproject.key.api.data.ProofScriptCommandDesc": ProofScriptCommandDesc,"org.keyproject.key.api.data.ProofMacroDesc": ProofMacroDesc,"org.keyproject.key.api.data.TraceValue": TraceValue,"org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams": SetTraceParams,"org.keyproject.key.api.data.KeyIdentifications$EnvironmentId": EnvironmentId,"org.keyproject.key.api.data.KeyIdentifications$ProofId": ProofId,"org.keyproject.key.api.data.KeyIdentifications$NodeId": NodeId,"java.util.List": List,"org.keyproject.key.api.data.NodeDesc": NodeDesc,"org.keyproject.key.api.data.StreategyOptions": StreategyOptions,"org.keyproject.key.api.data.MacroStatistic": MacroStatistic,"org.keyproject.key.api.data.ProofStatus": ProofStatus,"org.keyproject.key.api.data.TreeNodeDesc": TreeNodeDesc,"org.keyproject.key.api.data.KeyIdentifications$TreeNodeId": TreeNodeId,"org.keyproject.key.api.remoteapi.PrintOptions": PrintOptions,"org.keyproject.key.api.data.KeyIdentifications$NodeTextId": NodeTextId,"org.keyproject.key.api.data.NodeTextDesc": NodeTextDesc,"org.keyproject.key.api.data.KeyIdentifications$TermActionId": TermActionId,"org.keyproject.key.api.data.TermActionKind": TermActionKind,"org.keyproject.key.api.data.TermActionDesc": TermActionDesc,"org.keyproject.key.api.data.SortDesc": SortDesc,"org.keyproject.key.api.data.FunctionDesc": FunctionDesc,"org.keyproject.key.api.data.KeyIdentifications$ContractId": ContractId,"org.keyproject.key.api.data.ContractDesc": ContractDesc,"org.keyproject.key.api.data.LoadParams": LoadParams,"org.keyproject.key.api.data.ProblemDefinition": ProblemDefinition,"org.keyproject.key.api.remoteclient.LogTraceParams": LogTraceParams,"org.keyproject.key.api.remoteclient.MessageType": MessageType,"org.keyproject.key.api.remoteclient.ShowMessageParams": ShowMessageParams,"org.keyproject.key.api.remoteclient.ShowMessageRequestParams": ShowMessageRequestParams,"org.keyproject.key.api.remoteclient.MessageActionItem": MessageActionItem,"de.uka.ilkd.key.pp.Range": Range,"org.keyproject.key.api.remoteclient.ShowDocumentParams": ShowDocumentParams,"org.keyproject.key.api.remoteclient.ShowDocumentResult": ShowDocumentResult,"org.keyproject.key.api.data.TaskFinishedInfo": TaskFinishedInfo,"org.keyproject.key.api.data.TaskStartedInfo": TaskStartedInfo }
+
+KEY_DATA_CLASSES_REV = { "ExampleDesc": "org.keyproject.key.api.remoteapi.ExampleDesc","ProofScriptCommandDesc": "org.keyproject.key.api.data.ProofScriptCommandDesc","ProofMacroDesc": "org.keyproject.key.api.data.ProofMacroDesc","TraceValue": "org.keyproject.key.api.data.TraceValue","SetTraceParams": "org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams","EnvironmentId": "org.keyproject.key.api.data.KeyIdentifications$EnvironmentId","ProofId": "org.keyproject.key.api.data.KeyIdentifications$ProofId","NodeId": "org.keyproject.key.api.data.KeyIdentifications$NodeId","List": "java.util.List","NodeDesc": "org.keyproject.key.api.data.NodeDesc","StreategyOptions": "org.keyproject.key.api.data.StreategyOptions","MacroStatistic": "org.keyproject.key.api.data.MacroStatistic","ProofStatus": "org.keyproject.key.api.data.ProofStatus","TreeNodeDesc": "org.keyproject.key.api.data.TreeNodeDesc","TreeNodeId": "org.keyproject.key.api.data.KeyIdentifications$TreeNodeId","PrintOptions": "org.keyproject.key.api.remoteapi.PrintOptions","NodeTextId": "org.keyproject.key.api.data.KeyIdentifications$NodeTextId","NodeTextDesc": "org.keyproject.key.api.data.NodeTextDesc","TermActionId": "org.keyproject.key.api.data.KeyIdentifications$TermActionId","TermActionKind": "org.keyproject.key.api.data.TermActionKind","TermActionDesc": "org.keyproject.key.api.data.TermActionDesc","SortDesc": "org.keyproject.key.api.data.SortDesc","FunctionDesc": "org.keyproject.key.api.data.FunctionDesc","ContractId": "org.keyproject.key.api.data.KeyIdentifications$ContractId","ContractDesc": "org.keyproject.key.api.data.ContractDesc","LoadParams": "org.keyproject.key.api.data.LoadParams","ProblemDefinition": "org.keyproject.key.api.data.ProblemDefinition","LogTraceParams": "org.keyproject.key.api.remoteclient.LogTraceParams","MessageType": "org.keyproject.key.api.remoteclient.MessageType","ShowMessageParams": "org.keyproject.key.api.remoteclient.ShowMessageParams","ShowMessageRequestParams": "org.keyproject.key.api.remoteclient.ShowMessageRequestParams","MessageActionItem": "org.keyproject.key.api.remoteclient.MessageActionItem","Range": "de.uka.ilkd.key.pp.Range","ShowDocumentParams": "org.keyproject.key.api.remoteclient.ShowDocumentParams","ShowDocumentResult": "org.keyproject.key.api.remoteclient.ShowDocumentResult","TaskFinishedInfo": "org.keyproject.key.api.data.TaskFinishedInfo","TaskStartedInfo": "org.keyproject.key.api.data.TaskStartedInfo" }
 
diff --git a/keyext.client.python/keyapi/rpc.py b/keyext.client.python/keyapi/rpc.py
index ef6dc7dc18e..5f3d75092b2 100644
--- a/keyext.client.python/keyapi/rpc.py
+++ b/keyext.client.python/keyapi/rpc.py
@@ -4,7 +4,7 @@
 import typing
 from typing import Dict
 
-from keyapi import KEY_DATA_CLASSES
+from keyapi import KEY_DATA_CLASSES, KEY_DATA_CLASSES_REV
 
 JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
 LEN_HEADER = "Content-Length: "
@@ -18,7 +18,7 @@ class MyEncoder(json.JSONEncoder):
 
     def default(self, o):  # pylint: disable=E0202
         d = dict(o.__dict__)
-        d['$type'] = type(o).__name__
+        d['$class'] = KEY_DATA_CLASSES_REV[type(o).__name__]
         return d
 
 
@@ -192,6 +192,7 @@ def send_message(self, method_name, params, id=None):
             message_dict["id"] = id
         message_dict["method"] = method_name
         message_dict["params"] = params
+        # message_dict["$class"] = "org.eclipse.lsp4j.jsonrpc.messages.Message"
         self.json_rpc_endpoint.send_request(message_dict)
 
     def call_method(self, method_name, args):

From 6b6f5af04661dc75a732ac67b8685f41d9d150ad Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 17:47:55 +0100
Subject: [PATCH 38/50] Configurable Strategy (not Streategy) options for proof
 auto mode

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 33 +------
 .../key/api/data/StrategyOptions.java         | 94 +++++++++++++++++++
 .../key/api/data/StreategyOptions.java        | 11 ---
 .../key/api/remoteapi/ProofApi.java           |  8 +-
 keyext.client.python/keyapi/keydata.py        | 58 ++++++++----
 keyext.client.python/keyapi/server.py         |  4 +-
 .../keyapi/server_internal.py                 |  6 +-
 7 files changed, 148 insertions(+), 66 deletions(-)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 15c4714eb8a..30011c43ad1 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -131,7 +131,7 @@ public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommand
 
     @Override
     public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine,
-            StreategyOptions options) {
+            StrategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
@@ -148,7 +148,7 @@ public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLi
 
     @Override
     public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroName,
-            StreategyOptions options) {
+            StrategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
@@ -167,12 +167,13 @@ public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroName
     }
 
     @Override
-    public CompletableFuture<ProofStatus> auto(ProofId proofId, StreategyOptions options) {
+    public CompletableFuture<ProofStatus> auto(ProofId proofId, StrategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
-            configureProofMode(proof, options);
+            options.configure(proof);
             try {
+                System.out.println("Starting proof with setting "+proof.getSettings().getStrategySettings().getActiveStrategyProperties().getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY));
                 env.getProofControl().startAndWaitForAutoMode(proof);
                 // clientListener);
                 return ProofStatus.from(proofId, proof);
@@ -183,30 +184,6 @@ public CompletableFuture<ProofStatus> auto(ProofId proofId, StreategyOptions opt
 
     }
 
-    private static void configureProofMode(Proof proof, StreategyOptions options) {
-        StrategyProperties sp =
-            proof.getSettings().getStrategySettings().getActiveStrategyProperties();
-        sp.setProperty(StrategyProperties.METHOD_OPTIONS_KEY,
-            StrategyProperties.METHOD_CONTRACT);
-        sp.setProperty(StrategyProperties.DEP_OPTIONS_KEY,
-            StrategyProperties.DEP_ON);
-        sp.setProperty(StrategyProperties.QUERY_OPTIONS_KEY,
-            StrategyProperties.QUERY_ON);
-        sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY,
-            StrategyProperties.NON_LIN_ARITH_DEF_OPS);
-        sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY,
-            StrategyProperties.STOPMODE_NONCLOSE);
-        proof.getSettings().getStrategySettings().setActiveStrategyProperties(sp);
-        // Make sure that the new options are used
-        int maxSteps = 10000;
-        ProofSettings.DEFAULT_SETTINGS.getStrategySettings().setMaxSteps(maxSteps);
-        ProofSettings.DEFAULT_SETTINGS.getStrategySettings()
-                .setActiveStrategyProperties(sp);
-        proof.getSettings().getStrategySettings().setMaxSteps(maxSteps);
-        proof.setActiveStrategy(proof.getServices().getProfile()
-                .getDefaultStrategyFactory().create(proof, sp));
-    }
-
     @Override
     public CompletableFuture<Boolean> dispose(ProofId id) {
         data.dispose(id);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
new file mode 100644
index 00000000000..0539caacd3a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
@@ -0,0 +1,94 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+package org.keyproject.key.api.data;
+
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.settings.ProofSettings;
+import de.uka.ilkd.key.settings.StrategySettings;
+import de.uka.ilkd.key.strategy.StrategyProperties;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.23)
+ */
+public record StrategyOptions(
+        String method,
+        String dep,
+        String query,
+        String nonLinArith,
+        String stopMode,
+        int maxSteps) implements KeYDataTransferObject {
+    public static StrategyOptions defaultOptions() {
+        return new StrategyOptions(
+                "METHOD_CONTRACT",
+                "DEP_ON",
+                "QUERY_ON",
+                "NON_LIN_ARITH_DEF_OPS",
+                "STOPMODE_NONCLOSE",
+                1000
+        );
+    }
+    public static StrategyOptions from(StrategySettings settings) {
+        var sp = settings.getActiveStrategyProperties();
+        return new StrategyOptions(
+                sp.getProperty(StrategyProperties.METHOD_OPTIONS_KEY),
+                sp.getProperty(StrategyProperties.DEP_OPTIONS_KEY),
+                sp.getProperty(StrategyProperties.QUERY_OPTIONS_KEY),
+                sp.getProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY),
+                sp.getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY),
+                settings.getMaxSteps());
+    }
+    private String getVal(String key) {
+        Field f = null;
+        try {
+            f = StrategyProperties.class.getField(key);
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException("Unknown key: " + key);
+        }
+        Class<?> t = f.getType();
+        if (t == String.class) {
+            try {
+                return (String) f.get(this);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException("Cannot access field: " + key);
+            }
+        } else {
+            throw new RuntimeException("Type mismatch: " + t);
+        }
+    }
+    public void configure(Proof proof) {
+        var defaultOptions = defaultOptions();
+        StrategyProperties sp = proof.getSettings().getStrategySettings()
+                .getActiveStrategyProperties();
+        if (method != null) {
+            sp.setProperty(StrategyProperties.METHOD_OPTIONS_KEY, getVal(method));
+        } else {
+            sp.setProperty(StrategyProperties.METHOD_OPTIONS_KEY, defaultOptions.method());
+        }
+        if (dep != null) {
+            sp.setProperty(StrategyProperties.DEP_OPTIONS_KEY, getVal(dep));
+        } else {
+            sp.setProperty(StrategyProperties.DEP_OPTIONS_KEY, defaultOptions.dep());
+        }
+        if (query != null) {
+            sp.setProperty(StrategyProperties.QUERY_OPTIONS_KEY, getVal(query));
+        } else {
+            sp.setProperty(StrategyProperties.QUERY_OPTIONS_KEY, defaultOptions.query());
+        }
+        if (nonLinArith != null) {
+            sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY, getVal(nonLinArith));
+        } else {
+            sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY, defaultOptions.nonLinArith());
+        }
+        if (stopMode != null) {
+            sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY, getVal(stopMode));
+        } else {
+            sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY, defaultOptions.stopMode());
+        }
+        proof.getSettings().getStrategySettings().setActiveStrategyProperties(sp);
+        proof.getSettings().getStrategySettings().setMaxSteps(maxSteps);
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
deleted file mode 100644
index cbe1f4c269d..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api.data;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.23)
- */
-public record StreategyOptions() implements KeYDataTransferObject {
-}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index c5079efb1bc..a94da74f1dc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -12,7 +12,7 @@
 import org.keyproject.key.api.data.MacroStatistic;
 import org.keyproject.key.api.data.NodeDesc;
 import org.keyproject.key.api.data.ProofStatus;
-import org.keyproject.key.api.data.StreategyOptions;
+import org.keyproject.key.api.data.StrategyOptions;
 
 /**
  * @author Alexander Weigl
@@ -22,14 +22,14 @@
 public interface ProofApi {
     @JsonRequest
     CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
-            StreategyOptions options);
+            StrategyOptions options);
 
     @JsonRequest
     CompletableFuture<MacroStatistic> macro(ProofId proof, String macroName,
-            StreategyOptions options);
+            StrategyOptions options);
 
     @JsonRequest
-    CompletableFuture<ProofStatus> auto(ProofId proof, StreategyOptions options);
+    CompletableFuture<ProofStatus> auto(ProofId proof, StrategyOptions options);
 
     @JsonRequest
     CompletableFuture<Boolean> dispose(ProofId proof);
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index 2bce00393eb..ad07d1ce93a 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -17,6 +17,19 @@ def __init__(self, name, description):
         self.name = name
         self.description = description
 
+class ProofScriptCommandDesc:
+    """"""
+
+    macroId : str
+    """"""
+
+    documentation : str
+    """"""
+
+    def __init__(self, macroId, documentation):
+        self.macroId = macroId
+        self.documentation = documentation
+
 class ProofMacroDesc:
     """"""
 
@@ -38,19 +51,6 @@ def __init__(self, name, category, description, scriptCommandName):
         self.description = description
         self.scriptCommandName = scriptCommandName
 
-class ProofScriptCommandDesc:
-    """"""
-
-    macroId : str
-    """"""
-
-    documentation : str
-    """"""
-
-    def __init__(self, macroId, documentation):
-        self.macroId = macroId
-        self.documentation = documentation
-
 class TraceValue(enum.Enum):
     """"""
 
@@ -130,12 +130,34 @@ def __init__(self, nodeid, branchLabel, scriptRuleApplication, children):
         self.scriptRuleApplication = scriptRuleApplication
         self.children = children
 
-class StreategyOptions:
+class StrategyOptions:
     """"""
 
-    def __init__(self, ):
-        pass
+    method : str
+    """"""
+
+    dep : str
+    """"""
+
+    query : str
+    """"""
+
+    nonLinArith : str
+    """"""
+
+    stopMode : str
+    """"""
+
+    maxSteps : int
+    """"""
 
+    def __init__(self, method, dep, query, nonLinArith, stopMode, maxSteps):
+        self.method = method
+        self.dep = dep
+        self.query = query
+        self.nonLinArith = nonLinArith
+        self.stopMode = stopMode
+        self.maxSteps = maxSteps
 
 class MacroStatistic:
     """"""
@@ -563,7 +585,7 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = { "org.keyproject.key.api.remoteapi.ExampleDesc": ExampleDesc,"org.keyproject.key.api.data.ProofMacroDesc": ProofMacroDesc,"org.keyproject.key.api.data.ProofScriptCommandDesc": ProofScriptCommandDesc,"org.keyproject.key.api.data.TraceValue": TraceValue,"org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams": SetTraceParams,"org.keyproject.key.api.data.KeyIdentifications$EnvironmentId": EnvironmentId,"org.keyproject.key.api.data.KeyIdentifications$ProofId": ProofId,"org.keyproject.key.api.data.KeyIdentifications$NodeId": NodeId,"java.util.List": List,"org.keyproject.key.api.data.NodeDesc": NodeDesc,"org.keyproject.key.api.data.StreategyOptions": StreategyOptions,"org.keyproject.key.api.data.MacroStatistic": MacroStatistic,"org.keyproject.key.api.data.ProofStatus": ProofStatus,"org.keyproject.key.api.data.KeyIdentifications$TreeNodeId": TreeNodeId,"org.keyproject.key.api.data.TreeNodeDesc": TreeNodeDesc,"org.keyproject.key.api.remoteapi.PrintOptions": PrintOptions,"org.keyproject.key.api.data.KeyIdentifications$NodeTextId": NodeTextId,"org.keyproject.key.api.data.NodeTextDesc": NodeTextDesc,"org.keyproject.key.api.data.KeyIdentifications$TermActionId": TermActionId,"org.keyproject.key.api.data.TermActionKind": TermActionKind,"org.keyproject.key.api.data.TermActionDesc": TermActionDesc,"org.keyproject.key.api.data.SortDesc": SortDesc,"org.keyproject.key.api.data.FunctionDesc": FunctionDesc,"org.keyproject.key.api.data.KeyIdentifications$ContractId": ContractId,"org.keyproject.key.api.data.ContractDesc": ContractDesc,"org.keyproject.key.api.data.LoadParams": LoadParams,"org.keyproject.key.api.data.ProblemDefinition": ProblemDefinition,"org.keyproject.key.api.remoteclient.LogTraceParams": LogTraceParams,"org.keyproject.key.api.remoteclient.MessageType": MessageType,"org.keyproject.key.api.remoteclient.ShowMessageParams": ShowMessageParams,"org.keyproject.key.api.remoteclient.ShowMessageRequestParams": ShowMessageRequestParams,"org.keyproject.key.api.remoteclient.MessageActionItem": MessageActionItem,"de.uka.ilkd.key.pp.Range": Range,"org.keyproject.key.api.remoteclient.ShowDocumentParams": ShowDocumentParams,"org.keyproject.key.api.remoteclient.ShowDocumentResult": ShowDocumentResult,"org.keyproject.key.api.data.TaskFinishedInfo": TaskFinishedInfo,"org.keyproject.key.api.data.TaskStartedInfo": TaskStartedInfo }
+KEY_DATA_CLASSES = { "org.keyproject.key.api.remoteapi.ExampleDesc": ExampleDesc,"org.keyproject.key.api.data.ProofScriptCommandDesc": ProofScriptCommandDesc,"org.keyproject.key.api.data.ProofMacroDesc": ProofMacroDesc,"org.keyproject.key.api.data.TraceValue": TraceValue,"org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams": SetTraceParams,"org.keyproject.key.api.data.KeyIdentifications$EnvironmentId": EnvironmentId,"org.keyproject.key.api.data.KeyIdentifications$ProofId": ProofId,"org.keyproject.key.api.data.KeyIdentifications$NodeId": NodeId,"java.util.List": List,"org.keyproject.key.api.data.NodeDesc": NodeDesc,"org.keyproject.key.api.data.StrategyOptions": StrategyOptions,"org.keyproject.key.api.data.MacroStatistic": MacroStatistic,"org.keyproject.key.api.data.ProofStatus": ProofStatus,"org.keyproject.key.api.data.KeyIdentifications$TreeNodeId": TreeNodeId,"org.keyproject.key.api.data.TreeNodeDesc": TreeNodeDesc,"org.keyproject.key.api.remoteapi.PrintOptions": PrintOptions,"org.keyproject.key.api.data.KeyIdentifications$NodeTextId": NodeTextId,"org.keyproject.key.api.data.NodeTextDesc": NodeTextDesc,"org.keyproject.key.api.data.KeyIdentifications$TermActionId": TermActionId,"org.keyproject.key.api.data.TermActionKind": TermActionKind,"org.keyproject.key.api.data.TermActionDesc": TermActionDesc,"org.keyproject.key.api.data.SortDesc": SortDesc,"org.keyproject.key.api.data.FunctionDesc": FunctionDesc,"org.keyproject.key.api.data.KeyIdentifications$ContractId": ContractId,"org.keyproject.key.api.data.ContractDesc": ContractDesc,"org.keyproject.key.api.data.LoadParams": LoadParams,"org.keyproject.key.api.data.ProblemDefinition": ProblemDefinition,"org.keyproject.key.api.remoteclient.LogTraceParams": LogTraceParams,"org.keyproject.key.api.remoteclient.MessageType": MessageType,"org.keyproject.key.api.remoteclient.ShowMessageParams": ShowMessageParams,"org.keyproject.key.api.remoteclient.ShowMessageRequestParams": ShowMessageRequestParams,"org.keyproject.key.api.remoteclient.MessageActionItem": MessageActionItem,"de.uka.ilkd.key.pp.Range": Range,"org.keyproject.key.api.remoteclient.ShowDocumentParams": ShowDocumentParams,"org.keyproject.key.api.remoteclient.ShowDocumentResult": ShowDocumentResult,"org.keyproject.key.api.data.TaskFinishedInfo": TaskFinishedInfo,"org.keyproject.key.api.data.TaskStartedInfo": TaskStartedInfo }
 
-KEY_DATA_CLASSES_REV = { "ExampleDesc": "org.keyproject.key.api.remoteapi.ExampleDesc","ProofMacroDesc": "org.keyproject.key.api.data.ProofMacroDesc","ProofScriptCommandDesc": "org.keyproject.key.api.data.ProofScriptCommandDesc","TraceValue": "org.keyproject.key.api.data.TraceValue","SetTraceParams": "org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams","EnvironmentId": "org.keyproject.key.api.data.KeyIdentifications$EnvironmentId","ProofId": "org.keyproject.key.api.data.KeyIdentifications$ProofId","NodeId": "org.keyproject.key.api.data.KeyIdentifications$NodeId","List": "java.util.List","NodeDesc": "org.keyproject.key.api.data.NodeDesc","StreategyOptions": "org.keyproject.key.api.data.StreategyOptions","MacroStatistic": "org.keyproject.key.api.data.MacroStatistic","ProofStatus": "org.keyproject.key.api.data.ProofStatus","TreeNodeId": "org.keyproject.key.api.data.KeyIdentifications$TreeNodeId","TreeNodeDesc": "org.keyproject.key.api.data.TreeNodeDesc","PrintOptions": "org.keyproject.key.api.remoteapi.PrintOptions","NodeTextId": "org.keyproject.key.api.data.KeyIdentifications$NodeTextId","NodeTextDesc": "org.keyproject.key.api.data.NodeTextDesc","TermActionId": "org.keyproject.key.api.data.KeyIdentifications$TermActionId","TermActionKind": "org.keyproject.key.api.data.TermActionKind","TermActionDesc": "org.keyproject.key.api.data.TermActionDesc","SortDesc": "org.keyproject.key.api.data.SortDesc","FunctionDesc": "org.keyproject.key.api.data.FunctionDesc","ContractId": "org.keyproject.key.api.data.KeyIdentifications$ContractId","ContractDesc": "org.keyproject.key.api.data.ContractDesc","LoadParams": "org.keyproject.key.api.data.LoadParams","ProblemDefinition": "org.keyproject.key.api.data.ProblemDefinition","LogTraceParams": "org.keyproject.key.api.remoteclient.LogTraceParams","MessageType": "org.keyproject.key.api.remoteclient.MessageType","ShowMessageParams": "org.keyproject.key.api.remoteclient.ShowMessageParams","ShowMessageRequestParams": "org.keyproject.key.api.remoteclient.ShowMessageRequestParams","MessageActionItem": "org.keyproject.key.api.remoteclient.MessageActionItem","Range": "de.uka.ilkd.key.pp.Range","ShowDocumentParams": "org.keyproject.key.api.remoteclient.ShowDocumentParams","ShowDocumentResult": "org.keyproject.key.api.remoteclient.ShowDocumentResult","TaskFinishedInfo": "org.keyproject.key.api.data.TaskFinishedInfo","TaskStartedInfo": "org.keyproject.key.api.data.TaskStartedInfo" }
+KEY_DATA_CLASSES_REV = { "ExampleDesc": "org.keyproject.key.api.remoteapi.ExampleDesc","ProofScriptCommandDesc": "org.keyproject.key.api.data.ProofScriptCommandDesc","ProofMacroDesc": "org.keyproject.key.api.data.ProofMacroDesc","TraceValue": "org.keyproject.key.api.data.TraceValue","SetTraceParams": "org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams","EnvironmentId": "org.keyproject.key.api.data.KeyIdentifications$EnvironmentId","ProofId": "org.keyproject.key.api.data.KeyIdentifications$ProofId","NodeId": "org.keyproject.key.api.data.KeyIdentifications$NodeId","List": "java.util.List","NodeDesc": "org.keyproject.key.api.data.NodeDesc","StrategyOptions": "org.keyproject.key.api.data.StrategyOptions","MacroStatistic": "org.keyproject.key.api.data.MacroStatistic","ProofStatus": "org.keyproject.key.api.data.ProofStatus","TreeNodeId": "org.keyproject.key.api.data.KeyIdentifications$TreeNodeId","TreeNodeDesc": "org.keyproject.key.api.data.TreeNodeDesc","PrintOptions": "org.keyproject.key.api.remoteapi.PrintOptions","NodeTextId": "org.keyproject.key.api.data.KeyIdentifications$NodeTextId","NodeTextDesc": "org.keyproject.key.api.data.NodeTextDesc","TermActionId": "org.keyproject.key.api.data.KeyIdentifications$TermActionId","TermActionKind": "org.keyproject.key.api.data.TermActionKind","TermActionDesc": "org.keyproject.key.api.data.TermActionDesc","SortDesc": "org.keyproject.key.api.data.SortDesc","FunctionDesc": "org.keyproject.key.api.data.FunctionDesc","ContractId": "org.keyproject.key.api.data.KeyIdentifications$ContractId","ContractDesc": "org.keyproject.key.api.data.ContractDesc","LoadParams": "org.keyproject.key.api.data.LoadParams","ProblemDefinition": "org.keyproject.key.api.data.ProblemDefinition","LogTraceParams": "org.keyproject.key.api.remoteclient.LogTraceParams","MessageType": "org.keyproject.key.api.remoteclient.MessageType","ShowMessageParams": "org.keyproject.key.api.remoteclient.ShowMessageParams","ShowMessageRequestParams": "org.keyproject.key.api.remoteclient.ShowMessageRequestParams","MessageActionItem": "org.keyproject.key.api.remoteclient.MessageActionItem","Range": "de.uka.ilkd.key.pp.Range","ShowDocumentParams": "org.keyproject.key.api.remoteclient.ShowDocumentParams","ShowDocumentResult": "org.keyproject.key.api.remoteclient.ShowDocumentResult","TaskFinishedInfo": "org.keyproject.key.api.data.TaskFinishedInfo","TaskStartedInfo": "org.keyproject.key.api.data.TaskStartedInfo" }
 
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
index 9feef0f4d66..9d51d74d333 100644
--- a/keyext.client.python/keyapi/server.py
+++ b/keyext.client.python/keyapi/server.py
@@ -1,5 +1,5 @@
 import socket
-from keyapi import LspEndpoint, LoadParams, StreategyOptions
+from keyapi import LspEndpoint, LoadParams, StrategyOptions
 from keyapi.server_internal import KeyServer
 from keyapi.rpc import JsonRpcEndpoint
 
@@ -56,7 +56,7 @@ def __enter__(self):
     def root(self):
         return self.key.proofTree_root(self.proofHandle)
 
-    def auto(self, options = StreategyOptions()):
+    def auto(self, options = StrategyOptions(None, None, None, None, None, 10000)):
         return self.key.proof_auto(self.proofHandle, options)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
index 87285a33273..3b0b646cd3d 100644
--- a/keyext.client.python/keyapi/server_internal.py
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -101,7 +101,7 @@ def meta_version(self, ) -> str:
 
        return self._call_sync("meta/version", [])
 
-    def proof_auto(self, proof : ProofId, options : StreategyOptions) -> ProofStatus:
+    def proof_auto(self, proof : ProofId, options : StrategyOptions) -> ProofStatus:
        """"""
 
        return self._call_sync("proof/auto", [proof , options])
@@ -121,7 +121,7 @@ def proof_goals(self, proof : ProofId, onlyOpened : bool, onlyEnabled : bool) ->
 
        return self._call_sync("proof/goals", [proof , onlyOpened , onlyEnabled])
 
-    def proof_macro(self, proof : ProofId, macroName : str, options : StreategyOptions) -> MacroStatistic:
+    def proof_macro(self, proof : ProofId, macroName : str, options : StrategyOptions) -> MacroStatistic:
        """"""
 
        return self._call_sync("proof/macro", [proof , macroName , options])
@@ -136,7 +136,7 @@ def proof_root(self, proof : ProofId) -> NodeDesc:
 
        return self._call_sync("proof/root", [proof])
 
-    def proof_script(self, proof : ProofId, scriptLine : str, options : StreategyOptions) -> MacroStatistic:
+    def proof_script(self, proof : ProofId, scriptLine : str, options : StrategyOptions) -> MacroStatistic:
        """"""
 
        return self._call_sync("proof/script", [proof , scriptLine , options])

From 1b69ea1f64b2c8e397e581bb35d31ae16dc6c6a7 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 18:55:27 +0100
Subject: [PATCH 39/50] Extracted node description function

---
 .../ilkd/key/proof/ProofNodeDescription.java  | 42 +++++++++++++++++++
 .../ilkd/key/gui/sourceview/SourceView.java   | 40 +-----------------
 2 files changed, 44 insertions(+), 38 deletions(-)
 create mode 100644 key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java

diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java b/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java
new file mode 100644
index 00000000000..c64d36dd408
--- /dev/null
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java
@@ -0,0 +1,42 @@
+package de.uka.ilkd.key.proof;
+
+import java.io.Serializable;
+
+public class ProofNodeDescription implements Serializable {
+    /**
+     * Collects the information from the tree to which branch the current node belongs:
+     * <ul>
+     * <li>Invariant Initially Valid</li>
+     * <li>Body Preserves Invariant</li>
+     * <li>Use Case</li>
+     * <li>...</li>
+     * </ul>
+     *
+     * @param node the current node
+     * @return a String containing the path information to display
+     */
+    public static String collectPathInformation(Node node) {
+        while (node != null) {
+            if (node.getNodeInfo() != null && node.getNodeInfo().getBranchLabel() != null) {
+                String label = node.getNodeInfo().getBranchLabel();
+                /*
+                 * Are there other interesting labels? Please feel free to add them here.
+                 */
+                if (label.equals("Invariant Initially Valid")
+                        || label.equals("Invariant Preserved and Used") // for loop scope invariant
+                        || label.equals("Body Preserves Invariant") || label.equals("Use Case")
+                        || label.equals("Show Axiom Satisfiability") || label.startsWith("Pre (")
+                        || label.startsWith("Exceptional Post (") // exceptional postcondition
+                        || label.startsWith("Post (") // postcondition of a method
+                        || label.contains("Normal Execution") || label.contains("Null Reference")
+                        || label.contains("Index Out of Bounds") || label.contains("Validity")
+                        || label.contains("Precondition") || label.contains("Usage")) {
+                    return label;
+                }
+            }
+            node = node.parent();
+        }
+        // if no label was found we have to prove the postcondition
+        return "Show Postcondition/Modifiable";
+    }
+}
\ No newline at end of file
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
index ea5c5e16bce..1a864bf721f 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
@@ -53,6 +53,7 @@
 import org.key_project.logic.Visitor;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.collection.Pair;
+import de.uka.ilkd.key.proof.ProofNodeDescription;
 import org.key_project.util.java.IOUtil;
 import org.key_project.util.java.IOUtil.LineInformation;
 
@@ -686,7 +687,7 @@ private void updateGUI() {
             }
 
             // set the path information in the status bar
-            sourceStatusBar.setText(collectPathInformation(currentNode));
+            sourceStatusBar.setText(ProofNodeDescription.collectPathInformation(currentNode));
         } else {
             tabPane.setBorder(new TitledBorder(NO_SOURCE));
             sourceStatusBar.setText(NO_SOURCE);
@@ -824,43 +825,6 @@ private static PositionInfo joinPositionsRec(SourceElement se) {
         }
     }
 
-    /**
-     * Collects the information from the tree to which branch the current node belongs:
-     * <ul>
-     * <li>Invariant Initially Valid</li>
-     * <li>Body Preserves Invariant</li>
-     * <li>Use Case</li>
-     * <li>...</li>
-     * </ul>
-     *
-     * @param node the current node
-     * @return a String containing the path information to display
-     */
-    private static String collectPathInformation(Node node) {
-        while (node != null) {
-            if (node.getNodeInfo() != null && node.getNodeInfo().getBranchLabel() != null) {
-                String label = node.getNodeInfo().getBranchLabel();
-                /*
-                 * Are there other interesting labels? Please feel free to add them here.
-                 */
-                if (label.equals("Invariant Initially Valid")
-                        || label.equals("Invariant Preserved and Used") // for loop scope invariant
-                        || label.equals("Body Preserves Invariant") || label.equals("Use Case")
-                        || label.equals("Show Axiom Satisfiability") || label.startsWith("Pre (")
-                        || label.startsWith("Exceptional Post (") // exceptional postcondition
-                        || label.startsWith("Post (") // postcondition of a method
-                        || label.contains("Normal Execution") || label.contains("Null Reference")
-                        || label.contains("Index Out of Bounds") || label.contains("Validity")
-                        || label.contains("Precondition") || label.contains("Usage")) {
-                    return label;
-                }
-            }
-            node = node.parent();
-        }
-        // if no label was found we have to prove the postcondition
-        return "Show Postcondition/Modifiable";
-    }
-
     /**
      * The type of the tabbed pane contained in this {@code SourceView}.
      *

From dacd0943652b46d2eb8c10f855b8b3665b1feeed Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 18:56:43 +0100
Subject: [PATCH 40/50] Null serialization (necessary due to python class
 initialization), node labels

---
 .../org/keyproject/key/api/KeyApiImpl.java    |  6 ++--
 .../org/keyproject/key/api/StartServer.java   |  1 +
 .../org/keyproject/key/api/data/NodeDesc.java |  7 +++--
 keyext.client.python/keyapi/keydata.py        | 28 +++++++++++--------
 keyext.client.python/keyapi/server.py         |  3 ++
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 30011c43ad1..885dd3070cd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -56,6 +56,8 @@
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
+import static de.uka.ilkd.key.proof.ProofNodeDescription.collectPathInformation;
+
 public final class KeyApiImpl implements KeyApi {
     private final KeyIdentifications data = new KeyIdentifications();
 
@@ -215,7 +217,7 @@ private List<NodeDesc> asNodeDesc(ProofId proofId, Stream<Node> nodes) {
 
     private NodeDesc asNodeDesc(ProofId proofId, Node it) {
         return new NodeDesc(proofId, it.serialNr(), it.getNodeInfo().getBranchLabel(),
-            it.getNodeInfo().getScriptRuleApplication());
+            it.getNodeInfo().getScriptRuleApplication(), collectPathInformation(it));
     }
 
     @Override
@@ -232,7 +234,7 @@ private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
             root.getNodeInfo().getBranchLabel(),
             root.getNodeInfo().getScriptRuleApplication(),
-            list);
+            list, collectPathInformation(root));
     }
 
     @Override
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index 3b9bcb0ed52..cc182c85c25 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -202,6 +202,7 @@ public static void configureJson(GsonBuilder gsonBuilder) {
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
         gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
         gsonBuilder.registerTypeAdapterFactory(RuntimeClassNameTypeAdapterFactory.of(Object.class, "$class"));
+        gsonBuilder.serializeNulls();
     }
 
     public static Launcher<ClientApi> launch(OutputStream out, InputStream in, KeyApiImpl keyApi) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index b19bd883267..74323069725 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -14,9 +14,10 @@
 public record NodeDesc(KeyIdentifications.NodeId nodeid,
                        String branchLabel,
                        boolean scriptRuleApplication,
-                       @Nullable List<NodeDesc> children
+                       @Nullable List<NodeDesc> children,
+                       String description
 ) implements KeYDataTransferObject {
-    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication) {
-        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null);
+    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication, String description) {
+        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null, description);
     }
 }
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index ad07d1ce93a..f0ad341d5bc 100644
--- a/keyext.client.python/keyapi/keydata.py
+++ b/keyext.client.python/keyapi/keydata.py
@@ -124,11 +124,15 @@ class NodeDesc:
     children : List
     """"""
 
-    def __init__(self, nodeid, branchLabel, scriptRuleApplication, children):
+    description : str
+    """"""
+
+    def __init__(self, nodeid, branchLabel, scriptRuleApplication, children, description):
         self.nodeid = nodeid
         self.branchLabel = branchLabel
         self.scriptRuleApplication = scriptRuleApplication
         self.children = children
+        self.description = description
 
 class StrategyOptions:
     """"""
@@ -197,15 +201,6 @@ def __init__(self, id, openGoals, closedGoals):
         self.openGoals = openGoals
         self.closedGoals = closedGoals
 
-class TreeNodeId:
-    """"""
-
-    id : str
-    """"""
-
-    def __init__(self, id):
-        self.id = id
-
 class TreeNodeDesc:
     """"""
 
@@ -219,6 +214,15 @@ def __init__(self, id, name):
         self.id = id
         self.name = name
 
+class TreeNodeId:
+    """"""
+
+    id : str
+    """"""
+
+    def __init__(self, id):
+        self.id = id
+
 class PrintOptions:
     """"""
 
@@ -585,7 +589,7 @@ def __init__(self, ):
         pass
 
 
-KEY_DATA_CLASSES = { "org.keyproject.key.api.remoteapi.ExampleDesc": ExampleDesc,"org.keyproject.key.api.data.ProofScriptCommandDesc": ProofScriptCommandDesc,"org.keyproject.key.api.data.ProofMacroDesc": ProofMacroDesc,"org.keyproject.key.api.data.TraceValue": TraceValue,"org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams": SetTraceParams,"org.keyproject.key.api.data.KeyIdentifications$EnvironmentId": EnvironmentId,"org.keyproject.key.api.data.KeyIdentifications$ProofId": ProofId,"org.keyproject.key.api.data.KeyIdentifications$NodeId": NodeId,"java.util.List": List,"org.keyproject.key.api.data.NodeDesc": NodeDesc,"org.keyproject.key.api.data.StrategyOptions": StrategyOptions,"org.keyproject.key.api.data.MacroStatistic": MacroStatistic,"org.keyproject.key.api.data.ProofStatus": ProofStatus,"org.keyproject.key.api.data.KeyIdentifications$TreeNodeId": TreeNodeId,"org.keyproject.key.api.data.TreeNodeDesc": TreeNodeDesc,"org.keyproject.key.api.remoteapi.PrintOptions": PrintOptions,"org.keyproject.key.api.data.KeyIdentifications$NodeTextId": NodeTextId,"org.keyproject.key.api.data.NodeTextDesc": NodeTextDesc,"org.keyproject.key.api.data.KeyIdentifications$TermActionId": TermActionId,"org.keyproject.key.api.data.TermActionKind": TermActionKind,"org.keyproject.key.api.data.TermActionDesc": TermActionDesc,"org.keyproject.key.api.data.SortDesc": SortDesc,"org.keyproject.key.api.data.FunctionDesc": FunctionDesc,"org.keyproject.key.api.data.KeyIdentifications$ContractId": ContractId,"org.keyproject.key.api.data.ContractDesc": ContractDesc,"org.keyproject.key.api.data.LoadParams": LoadParams,"org.keyproject.key.api.data.ProblemDefinition": ProblemDefinition,"org.keyproject.key.api.remoteclient.LogTraceParams": LogTraceParams,"org.keyproject.key.api.remoteclient.MessageType": MessageType,"org.keyproject.key.api.remoteclient.ShowMessageParams": ShowMessageParams,"org.keyproject.key.api.remoteclient.ShowMessageRequestParams": ShowMessageRequestParams,"org.keyproject.key.api.remoteclient.MessageActionItem": MessageActionItem,"de.uka.ilkd.key.pp.Range": Range,"org.keyproject.key.api.remoteclient.ShowDocumentParams": ShowDocumentParams,"org.keyproject.key.api.remoteclient.ShowDocumentResult": ShowDocumentResult,"org.keyproject.key.api.data.TaskFinishedInfo": TaskFinishedInfo,"org.keyproject.key.api.data.TaskStartedInfo": TaskStartedInfo }
+KEY_DATA_CLASSES = { "org.keyproject.key.api.remoteapi.ExampleDesc": ExampleDesc,"org.keyproject.key.api.data.ProofScriptCommandDesc": ProofScriptCommandDesc,"org.keyproject.key.api.data.ProofMacroDesc": ProofMacroDesc,"org.keyproject.key.api.data.TraceValue": TraceValue,"org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams": SetTraceParams,"org.keyproject.key.api.data.KeyIdentifications$EnvironmentId": EnvironmentId,"org.keyproject.key.api.data.KeyIdentifications$ProofId": ProofId,"org.keyproject.key.api.data.KeyIdentifications$NodeId": NodeId,"java.util.List": List,"org.keyproject.key.api.data.NodeDesc": NodeDesc,"org.keyproject.key.api.data.StrategyOptions": StrategyOptions,"org.keyproject.key.api.data.MacroStatistic": MacroStatistic,"org.keyproject.key.api.data.ProofStatus": ProofStatus,"org.keyproject.key.api.data.TreeNodeDesc": TreeNodeDesc,"org.keyproject.key.api.data.KeyIdentifications$TreeNodeId": TreeNodeId,"org.keyproject.key.api.remoteapi.PrintOptions": PrintOptions,"org.keyproject.key.api.data.KeyIdentifications$NodeTextId": NodeTextId,"org.keyproject.key.api.data.NodeTextDesc": NodeTextDesc,"org.keyproject.key.api.data.KeyIdentifications$TermActionId": TermActionId,"org.keyproject.key.api.data.TermActionKind": TermActionKind,"org.keyproject.key.api.data.TermActionDesc": TermActionDesc,"org.keyproject.key.api.data.SortDesc": SortDesc,"org.keyproject.key.api.data.FunctionDesc": FunctionDesc,"org.keyproject.key.api.data.KeyIdentifications$ContractId": ContractId,"org.keyproject.key.api.data.ContractDesc": ContractDesc,"org.keyproject.key.api.data.LoadParams": LoadParams,"org.keyproject.key.api.data.ProblemDefinition": ProblemDefinition,"org.keyproject.key.api.remoteclient.LogTraceParams": LogTraceParams,"org.keyproject.key.api.remoteclient.MessageType": MessageType,"org.keyproject.key.api.remoteclient.ShowMessageParams": ShowMessageParams,"org.keyproject.key.api.remoteclient.ShowMessageRequestParams": ShowMessageRequestParams,"org.keyproject.key.api.remoteclient.MessageActionItem": MessageActionItem,"de.uka.ilkd.key.pp.Range": Range,"org.keyproject.key.api.remoteclient.ShowDocumentParams": ShowDocumentParams,"org.keyproject.key.api.remoteclient.ShowDocumentResult": ShowDocumentResult,"org.keyproject.key.api.data.TaskFinishedInfo": TaskFinishedInfo,"org.keyproject.key.api.data.TaskStartedInfo": TaskStartedInfo }
 
-KEY_DATA_CLASSES_REV = { "ExampleDesc": "org.keyproject.key.api.remoteapi.ExampleDesc","ProofScriptCommandDesc": "org.keyproject.key.api.data.ProofScriptCommandDesc","ProofMacroDesc": "org.keyproject.key.api.data.ProofMacroDesc","TraceValue": "org.keyproject.key.api.data.TraceValue","SetTraceParams": "org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams","EnvironmentId": "org.keyproject.key.api.data.KeyIdentifications$EnvironmentId","ProofId": "org.keyproject.key.api.data.KeyIdentifications$ProofId","NodeId": "org.keyproject.key.api.data.KeyIdentifications$NodeId","List": "java.util.List","NodeDesc": "org.keyproject.key.api.data.NodeDesc","StrategyOptions": "org.keyproject.key.api.data.StrategyOptions","MacroStatistic": "org.keyproject.key.api.data.MacroStatistic","ProofStatus": "org.keyproject.key.api.data.ProofStatus","TreeNodeId": "org.keyproject.key.api.data.KeyIdentifications$TreeNodeId","TreeNodeDesc": "org.keyproject.key.api.data.TreeNodeDesc","PrintOptions": "org.keyproject.key.api.remoteapi.PrintOptions","NodeTextId": "org.keyproject.key.api.data.KeyIdentifications$NodeTextId","NodeTextDesc": "org.keyproject.key.api.data.NodeTextDesc","TermActionId": "org.keyproject.key.api.data.KeyIdentifications$TermActionId","TermActionKind": "org.keyproject.key.api.data.TermActionKind","TermActionDesc": "org.keyproject.key.api.data.TermActionDesc","SortDesc": "org.keyproject.key.api.data.SortDesc","FunctionDesc": "org.keyproject.key.api.data.FunctionDesc","ContractId": "org.keyproject.key.api.data.KeyIdentifications$ContractId","ContractDesc": "org.keyproject.key.api.data.ContractDesc","LoadParams": "org.keyproject.key.api.data.LoadParams","ProblemDefinition": "org.keyproject.key.api.data.ProblemDefinition","LogTraceParams": "org.keyproject.key.api.remoteclient.LogTraceParams","MessageType": "org.keyproject.key.api.remoteclient.MessageType","ShowMessageParams": "org.keyproject.key.api.remoteclient.ShowMessageParams","ShowMessageRequestParams": "org.keyproject.key.api.remoteclient.ShowMessageRequestParams","MessageActionItem": "org.keyproject.key.api.remoteclient.MessageActionItem","Range": "de.uka.ilkd.key.pp.Range","ShowDocumentParams": "org.keyproject.key.api.remoteclient.ShowDocumentParams","ShowDocumentResult": "org.keyproject.key.api.remoteclient.ShowDocumentResult","TaskFinishedInfo": "org.keyproject.key.api.data.TaskFinishedInfo","TaskStartedInfo": "org.keyproject.key.api.data.TaskStartedInfo" }
+KEY_DATA_CLASSES_REV = { "ExampleDesc": "org.keyproject.key.api.remoteapi.ExampleDesc","ProofScriptCommandDesc": "org.keyproject.key.api.data.ProofScriptCommandDesc","ProofMacroDesc": "org.keyproject.key.api.data.ProofMacroDesc","TraceValue": "org.keyproject.key.api.data.TraceValue","SetTraceParams": "org.keyproject.key.api.remoteapi.ServerManagement$SetTraceParams","EnvironmentId": "org.keyproject.key.api.data.KeyIdentifications$EnvironmentId","ProofId": "org.keyproject.key.api.data.KeyIdentifications$ProofId","NodeId": "org.keyproject.key.api.data.KeyIdentifications$NodeId","List": "java.util.List","NodeDesc": "org.keyproject.key.api.data.NodeDesc","StrategyOptions": "org.keyproject.key.api.data.StrategyOptions","MacroStatistic": "org.keyproject.key.api.data.MacroStatistic","ProofStatus": "org.keyproject.key.api.data.ProofStatus","TreeNodeDesc": "org.keyproject.key.api.data.TreeNodeDesc","TreeNodeId": "org.keyproject.key.api.data.KeyIdentifications$TreeNodeId","PrintOptions": "org.keyproject.key.api.remoteapi.PrintOptions","NodeTextId": "org.keyproject.key.api.data.KeyIdentifications$NodeTextId","NodeTextDesc": "org.keyproject.key.api.data.NodeTextDesc","TermActionId": "org.keyproject.key.api.data.KeyIdentifications$TermActionId","TermActionKind": "org.keyproject.key.api.data.TermActionKind","TermActionDesc": "org.keyproject.key.api.data.TermActionDesc","SortDesc": "org.keyproject.key.api.data.SortDesc","FunctionDesc": "org.keyproject.key.api.data.FunctionDesc","ContractId": "org.keyproject.key.api.data.KeyIdentifications$ContractId","ContractDesc": "org.keyproject.key.api.data.ContractDesc","LoadParams": "org.keyproject.key.api.data.LoadParams","ProblemDefinition": "org.keyproject.key.api.data.ProblemDefinition","LogTraceParams": "org.keyproject.key.api.remoteclient.LogTraceParams","MessageType": "org.keyproject.key.api.remoteclient.MessageType","ShowMessageParams": "org.keyproject.key.api.remoteclient.ShowMessageParams","ShowMessageRequestParams": "org.keyproject.key.api.remoteclient.ShowMessageRequestParams","MessageActionItem": "org.keyproject.key.api.remoteclient.MessageActionItem","Range": "de.uka.ilkd.key.pp.Range","ShowDocumentParams": "org.keyproject.key.api.remoteclient.ShowDocumentParams","ShowDocumentResult": "org.keyproject.key.api.remoteclient.ShowDocumentResult","TaskFinishedInfo": "org.keyproject.key.api.data.TaskFinishedInfo","TaskStartedInfo": "org.keyproject.key.api.data.TaskStartedInfo" }
 
diff --git a/keyext.client.python/keyapi/server.py b/keyext.client.python/keyapi/server.py
index 9d51d74d333..067f291fd3b 100644
--- a/keyext.client.python/keyapi/server.py
+++ b/keyext.client.python/keyapi/server.py
@@ -59,5 +59,8 @@ def root(self):
     def auto(self, options = StrategyOptions(None, None, None, None, None, 10000)):
         return self.key.proof_auto(self.proofHandle, options)
 
+    def goals(self, open_only = False, only_enabled = False):
+        return self.key.proof_goals(self.proofHandle, open_only, only_enabled)
+
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.key.proof_dispose(self.proofHandle)
\ No newline at end of file

From 0f84a98e71219fbb792c3c1da0b59f80d086af3f Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Mon, 7 Apr 2025 00:15:17 +0200
Subject: [PATCH 41/50] reformat / remove weakrefs from the data model

---
 .../ilkd/key/proof/ProofNodeDescription.java  |   5 +-
 .../ilkd/key/gui/sourceview/SourceView.java   |   2 +-
 .../key/api/doc/ExtractMetaData.java          |   3 +-
 .../key_project/key/api/doc/Metamodel.java    | 101 ++++++++++--------
 .../key/api/doc/PythonGenerator.java          |  24 +++--
 .../org/keyproject/key/api/KeyApiImpl.java    |  17 +--
 .../RuntimeClassNameTypeAdapterFactory.java   |  47 ++++----
 .../org/keyproject/key/api/StartServer.java   |   4 +-
 .../keyproject/key/api/TermActionUtil.java    |   3 +-
 .../keyproject/key/api/data/ContractDesc.java |  12 ++-
 .../keyproject/key/api/data/FunctionDesc.java |  15 +--
 .../key/api/data/KeYDataTransferObject.java   |   3 +
 .../key/api/data/KeyIdentifications.java      |  37 +++----
 .../keyproject/key/api/data/LoadParams.java   |   4 +-
 .../key/api/data/MacroDescription.java        |   3 +-
 .../key/api/data/MacroStatistic.java          |   8 +-
 .../org/keyproject/key/api/data/NodeDesc.java |  15 +--
 .../keyproject/key/api/data/NodeTextDesc.java |   3 +-
 .../key/api/data/ProblemDefinition.java       |   3 +-
 .../key/api/data/ProofMacroDesc.java          |   5 +-
 .../key/api/data/ProofScriptCommandDesc.java  |   6 +-
 .../keyproject/key/api/data/ProofStatus.java  |   3 +-
 .../org/keyproject/key/api/data/SortDesc.java |   8 +-
 .../key/api/data/StrategyOptions.java         |  36 ++++---
 .../keyproject/key/api/data/TreeNodeDesc.java |   6 +-
 .../key/api/remoteapi/PrintOptions.java       |   2 +-
 .../api/remoteclient/LogMessageParams.java    |   3 +-
 .../key/api/remoteclient/LogTraceParams.java  |   8 +-
 .../api/remoteclient/MessageActionItem.java   |   5 +-
 .../api/remoteclient/ShowDocumentParams.java  |   3 +-
 .../api/remoteclient/ShowDocumentResult.java  |   3 +-
 .../ShowMessageRequestParams.java             |   5 +-
 32 files changed, 217 insertions(+), 185 deletions(-)

diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java b/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java
index c64d36dd408..30cd0d78bea 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/ProofNodeDescription.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.proof;
 
 import java.io.Serializable;
@@ -39,4 +42,4 @@ public static String collectPathInformation(Node node) {
         // if no label was found we have to prove the postcondition
         return "Show Postcondition/Modifiable";
     }
-}
\ No newline at end of file
+}
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
index 1a864bf721f..2ddb0f60fd9 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java
@@ -47,13 +47,13 @@
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.ProofJavaSourceCollection;
+import de.uka.ilkd.key.proof.ProofNodeDescription;
 import de.uka.ilkd.key.proof.io.consistency.FileRepo;
 import de.uka.ilkd.key.settings.ProofIndependentSettings;
 
 import org.key_project.logic.Visitor;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.collection.Pair;
-import de.uka.ilkd.key.proof.ProofNodeDescription;
 import org.key_project.util.java.IOUtil;
 import org.key_project.util.java.IOUtil.LineInformation;
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 4d62b151260..ce10a14512c 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -235,7 +235,8 @@ private Metamodel.Type createType(Class<?> type) {
                 documentation);
 
 
-        var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(), documentation);
+        var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(),
+            documentation);
         final var list = Arrays.stream(type.getDeclaredFields())
                 .map(it -> new Metamodel.Field(it.getName(), getOrFindType(it.getType()).name()))
                 .toList();
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index 38c2e8cdfc4..13f0e0573e3 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -40,69 +40,74 @@ default String kind() {
     public record Argument(String name, String type) {
     }
 
-    record ServerRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    record ServerRequest(String name, String documentation, List<Argument> args, Type returnType)
+            implements Endpoint {
     }
 
-    record ServerNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    record ServerNotification(String name, String documentation, List<Argument> args)
+            implements Endpoint {
     }
 
-    record ClientRequest(String name, String documentation, List<Argument> args, Type returnType) implements Endpoint {
+    record ClientRequest(String name, String documentation, List<Argument> args, Type returnType)
+            implements Endpoint {
     }
 
-    record ClientNotification(String name, String documentation, List<Argument> args) implements Endpoint {
+    record ClientNotification(String name, String documentation, List<Argument> args)
+            implements Endpoint {
     }
 
-    record Field(String name, /*Type*/ String type, String documentation) {
+    record Field(String name, /* Type */ String type, String documentation) {
 
-    Field(String name, String type) {
+        Field(String name, String type) {
             this(name, type, "");
         }
-}
+    }
 
-public sealed
+    public sealed
 
 
-interface Type {
-    default String kind() {
+    interface Type {
+        default String kind() {
             return getClass().getName();
         }
 
-    String documentation();
+        String documentation();
 
-    String name();
+        String name();
 
-    String identifier();
-}
+        String identifier();
+    }
 
 
-enum BuiltinType implements Type {
-    INT, LONG, STRING, BOOL, DOUBLE;
+    enum BuiltinType implements Type {
+        INT, LONG, STRING, BOOL, DOUBLE;
 
-    @Override
-    public String documentation() {
-        return "built-in data type";
-    }
+        @Override
+        public String documentation() {
+            return "built-in data type";
+        }
 
-    public String identifier() {
-        return name().toLowerCase();
-    }
+        public String identifier() {
+            return name().toLowerCase();
+        }
 
-}
+    }
 
     record ListType(Type type, String documentation) implements Type {
 
-    @Override
-    public String name() {
-        return type().name() + "[]";
-    }
+        @Override
+        public String name() {
+            return type().name() + "[]";
+        }
 
-    public String identifier() {
-        return type().identifier()+"[]";
-    }
+        public String identifier() {
+            return type().identifier() + "[]";
+        }
 
     }
 
-    record ObjectType(String typeName, String typeFullName, List<Field> fields, String documentation) implements Type {
+    record ObjectType(String typeName, String typeFullName, List<Field> fields,
+            String documentation) implements Type {
 
         @Override
         public String name() {
@@ -116,25 +121,27 @@ public String identifier() {
 
     public record EitherType(Type a, Type b, String documentation) implements Type {
 
-    @Override
-    public String name() {
-        return "either<a,b>";
-    }
+        @Override
+        public String name() {
+            return "either<a,b>";
+        }
 
-    public String identifier() {
-        return name();
-    }
+        public String identifier() {
+            return name();
+        }
 
     }
 
-    public record EnumType(String typeName, String typeFullName, List<String> values, String documentation) implements Type {
+    public record EnumType(String typeName, String typeFullName, List<String> values,
+            String documentation) implements Type {
 
-    @Override
-    public String name() {
-        return typeName;
-    }
+        @Override
+        public String name() {
+            return typeName;
+        }
 
-    public String identifier(){
-        return typeFullName;
+        public String identifier() {
+            return typeFullName;
+        }
     }
-}}
+}
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 2aab6246178..1a58a122db2 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -41,14 +41,14 @@ public String get() {
 
     protected String asPython(String typeName) {
         return switch (typeName) {
-            case "INT", "LONG" -> "int";
-            case "STRING" -> "str";
-            case "BOOL" -> "bool";
-            case "DOUBLE" -> "float";
-            default -> {
-                var t = findType(typeName);
-                yield asPython(t);
-            }
+        case "INT", "LONG" -> "int";
+        case "STRING" -> "str";
+        case "BOOL" -> "bool";
+        case "DOUBLE" -> "float";
+        default -> {
+            var t = findType(typeName);
+            yield asPython(t);
+        }
         };
     }
 
@@ -200,12 +200,14 @@ protected void run() {
             metamodel.types().forEach(this::printType);
 
             var names =
-                metamodel.types().stream().map(it -> "\"%s\": %s".formatted(it.identifier(), it.name()))
+                metamodel.types().stream()
+                        .map(it -> "\"%s\": %s".formatted(it.identifier(), it.name()))
                         .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
             var names_reverse =
-                    metamodel.types().stream().map(it -> "\"%s\": \"%s\"".formatted(it.name(), it.identifier()))
-                            .collect(Collectors.joining(","));
+                metamodel.types().stream()
+                        .map(it -> "\"%s\": \"%s\"".formatted(it.name(), it.identifier()))
+                        .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES_REV = { %s }%n%n", names_reverse);
         }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 885dd3070cd..0915aba9b7b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -36,18 +36,17 @@
 import de.uka.ilkd.key.prover.ProverTaskListener;
 import de.uka.ilkd.key.prover.TaskFinishedInfo;
 import de.uka.ilkd.key.prover.TaskStartedInfo;
-import de.uka.ilkd.key.settings.ProofSettings;
 import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.strategy.StrategyProperties;
 import de.uka.ilkd.key.util.KeYConstants;
 
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSet;
+import org.key_project.util.reflection.ClassLoaderUtil;
 
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.key_project.util.reflection.ClassLoaderUtil;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.internal.NodeText;
@@ -120,14 +119,17 @@ public CompletableFuture<String> getVersion() {
     @Override
     public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                StreamSupport.stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(),false)
+            StreamSupport
+                    .stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(), false)
                     .map(ProofMacroDesc::from).toList());
     }
 
     @Override
     public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                StreamSupport.stream(ClassLoaderUtil.loadServices(ProofScriptCommand.class).spliterator(),false)
+            StreamSupport
+                    .stream(ClassLoaderUtil.loadServices(ProofScriptCommand.class).spliterator(),
+                        false)
                     .map(ProofScriptCommandDesc::from).toList());
     }
 
@@ -154,7 +156,8 @@ public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroName
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
-            var macro = StreamSupport.stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(),false)
+            var macro = StreamSupport
+                    .stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(), false)
                     .filter(it -> it.getName().equals(macroName)).findFirst().orElseThrow();
 
             try {
@@ -175,7 +178,9 @@ public CompletableFuture<ProofStatus> auto(ProofId proofId, StrategyOptions opti
             var env = data.find(proofId.env());
             options.configure(proof);
             try {
-                System.out.println("Starting proof with setting "+proof.getSettings().getStrategySettings().getActiveStrategyProperties().getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY));
+                System.out.println("Starting proof with setting "
+                    + proof.getSettings().getStrategySettings().getActiveStrategyProperties()
+                            .getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY));
                 env.getProofControl().startAndWaitForAutoMode(proof);
                 // clientListener);
                 return ProofStatus.from(proofId, proof);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
index 4e981fa17e9..855e1e3ca84 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api;
 
 import java.io.IOException;
@@ -18,8 +21,9 @@
 import org.keyproject.key.api.data.KeYDataTransferObject;
 
 /*
-Taken & Modified from
-https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-serializing-object-of-any-type
+ * Taken & Modified from
+ * https://stackoverflow.com/questions/39999278/gson-how-to-include-class-name-property-when-
+ * serializing-object-of-any-type
  */
 
 public final class RuntimeClassNameTypeAdapterFactory<T> implements TypeAdapterFactory {
@@ -40,7 +44,8 @@ private RuntimeClassNameTypeAdapterFactory(Class<?> baseType, String typeFieldNa
      * Creates a new runtime type adapter using for {@code baseType} using {@code
      * typeFieldName} as the type field name. Type field names are case sensitive.
      */
-    public static <T> RuntimeClassNameTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
+    public static <T> RuntimeClassNameTypeAdapterFactory<T> of(Class<T> baseType,
+            String typeFieldName) {
         return new RuntimeClassNameTypeAdapterFactory<T>(baseType, typeFieldName);
     }
 
@@ -57,9 +62,10 @@ public static <T> RuntimeClassNameTypeAdapterFactory<T> of(Class<T> baseType) {
      * sensitive.
      *
      * @throws IllegalArgumentException if either {@code type} or {@code label}
-     *     have already been registered on this type adapter.
+     *         have already been registered on this type adapter.
      */
-    public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T> type, String label) {
+    public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T> type,
+            String label) {
         if (type == null || label == null) {
             throw new NullPointerException();
         }
@@ -76,7 +82,7 @@ public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T>
      * name}. Labels are case sensitive.
      *
      * @throws IllegalArgumentException if either {@code type} or its simple name
-     *     have already been registered on this type adapter.
+     *         have already been registered on this type adapter.
      */
     public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T> type) {
         return registerSubtype(type, type.getSimpleName());
@@ -84,16 +90,16 @@ public RuntimeClassNameTypeAdapterFactory<T> registerSubtype(Class<? extends T>
 
     public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
 
-        if (!KeYDataTransferObject.class.isAssignableFrom(type.getRawType())){
+        if (!KeYDataTransferObject.class.isAssignableFrom(type.getRawType())) {
             return null;
         }
 
-        final Map<String, TypeAdapter<?>> labelToDelegate
-                = new LinkedHashMap<String, TypeAdapter<?>>();
-        final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
-                = new LinkedHashMap<Class<?>, TypeAdapter<?>>();
+        final Map<String, TypeAdapter<?>> labelToDelegate =
+            new LinkedHashMap<String, TypeAdapter<?>>();
+        final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate =
+            new LinkedHashMap<Class<?>, TypeAdapter<?>>();
 
-        if(Object.class.isAssignableFrom(type.getRawType()) ) {
+        if (Object.class.isAssignableFrom(type.getRawType())) {
             TypeAdapter<?> delegate = gson.getDelegateAdapter(this, type);
             // Modified: What is type.getRawType().getName() now was "class" before
             labelToDelegate.put(type.getRawType().getName(), delegate);
@@ -101,40 +107,43 @@ public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
         }
 
         return new TypeAdapter<R>() {
-            @Override public R read(JsonReader in) throws IOException {
+            @Override
+            public R read(JsonReader in) throws IOException {
                 JsonElement jsonElement = Streams.parse(in);
                 JsonElement labelJsonElement = jsonElement.getAsJsonObject().remove(typeFieldName);
                 if (labelJsonElement == null) {
                     throw new JsonParseException("cannot deserialize " + baseType
-                            + " because it does not define a field named " + typeFieldName);
+                        + " because it does not define a field named " + typeFieldName);
                 }
                 String label = labelJsonElement.getAsString();
                 @SuppressWarnings("unchecked") // registration requires that subtype extends T
                 TypeAdapter<R> delegate = (TypeAdapter<R>) labelToDelegate.get(label);
                 if (delegate == null) {
-                    throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
+                    throw new JsonParseException(
+                        "cannot deserialize " + baseType + " subtype named "
                             + label + "; did you forget to register a subtype?");
                 }
                 return delegate.fromJsonTree(jsonElement);
             }
 
-            @Override public void write(JsonWriter out, R value) throws IOException {
+            @Override
+            public void write(JsonWriter out, R value) throws IOException {
                 Class<?> srcType = value.getClass();
                 String label = srcType.getName();
                 @SuppressWarnings("unchecked") // registration requires that subtype extends T
                 TypeAdapter<R> delegate = (TypeAdapter<R>) subtypeToDelegate.get(srcType);
                 if (delegate == null) {
                     throw new JsonParseException("cannot serialize " + srcType.getName()
-                            + "; did you forget to register a subtype?");
+                        + "; did you forget to register a subtype?");
                 }
                 JsonElement jsonTree = delegate.toJsonTree(value);
-                if(jsonTree.isJsonPrimitive()) {
+                if (jsonTree.isJsonPrimitive()) {
                     Streams.write(jsonTree, out);
                 } else {
                     JsonObject jsonObject = jsonTree.getAsJsonObject();
                     if (jsonObject.has(typeFieldName)) {
                         throw new JsonParseException("cannot serialize " + srcType.getName()
-                                + " because it already defines a field named " + typeFieldName);
+                            + " because it already defines a field named " + typeFieldName);
                     }
                     JsonObject clone = new JsonObject();
                     clone.add(typeFieldName, new JsonPrimitive(label));
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index cc182c85c25..e052a6e9f6d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -18,7 +18,6 @@
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.websocket.jakarta.WebSocketLauncherBuilder;
 import org.keyproject.key.api.adapters.KeyAdapter;
-import org.keyproject.key.api.data.KeYDataTransferObject;
 import org.keyproject.key.api.remoteclient.ClientApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -201,7 +200,8 @@ public Boolean apply(Void unused) {
     public static void configureJson(GsonBuilder gsonBuilder) {
         gsonBuilder.registerTypeAdapter(File.class, new KeyAdapter.FileTypeAdapter());
         gsonBuilder.registerTypeAdapter(Throwable.class, new KeyAdapter.ThrowableAdapter());
-        gsonBuilder.registerTypeAdapterFactory(RuntimeClassNameTypeAdapterFactory.of(Object.class, "$class"));
+        gsonBuilder.registerTypeAdapterFactory(
+            RuntimeClassNameTypeAdapterFactory.of(Object.class, "$class"));
         gsonBuilder.serializeNulls();
     }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 854dfb98b1c..9ce67460203 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.StreamSupport;
 
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.control.ProofControl;
@@ -19,9 +18,9 @@
 import org.key_project.logic.Name;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
+import org.key_project.util.reflection.ClassLoaderUtil;
 
 import org.jspecify.annotations.NonNull;
-import org.key_project.util.reflection.ClassLoaderUtil;
 import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
 import org.keyproject.key.api.data.TermActionDesc;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index b577fb4c212..eec8299088b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -10,11 +10,13 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record ContractDesc(KeyIdentifications.ContractId contractId, String name, String displayName,
-                           String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
-    public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services, Contract it) {
+public record ContractDesc(KeyIdentifications.ContractId contractId, String name,
+        String displayName,
+        String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
+    public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services,
+            Contract it) {
         return new ContractDesc(new KeyIdentifications.ContractId(envId, it.getName()),
-                it.getName(), it.getDisplayName(), it.getTypeName(),
-                it.getHTMLText(services), it.getPlainText(services));
+            it.getName(), it.getDisplayName(), it.getTypeName(),
+            it.getHTMLText(services), it.getPlainText(services));
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 4d851f298bd..eb497323015 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -12,14 +12,15 @@
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts, boolean rigid,
-                           boolean unique, boolean skolemConstant) implements KeYDataTransferObject {
+public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts,
+        boolean rigid,
+        boolean unique, boolean skolemConstant) implements KeYDataTransferObject {
     public static FunctionDesc from(Function fn) {
         return new FunctionDesc(fn.name().toString(), fn.sort().declarationString(),
-                SortDesc.from(fn.sort()),
-                fn.argSorts().stream().map(SortDesc::from).toList(),
-                fn.isRigid(),
-                fn.isUnique(),
-                fn.isSkolemConstant());
+            SortDesc.from(fn.sort()),
+            fn.argSorts().stream().map(SortDesc::from).toList(),
+            fn.isRigid(),
+            fn.isUnique(),
+            fn.isSkolemConstant());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
index a9841b17a27..522a1c7a0e9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
@@ -1,3 +1,6 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 public interface KeYDataTransferObject {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index 5ce36373e59..a58f32ef482 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import java.lang.ref.WeakReference;
 import java.util.Objects;
 
 import de.uka.ilkd.key.control.KeYEnvironment;
@@ -12,7 +11,6 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.internal.NodeText;
 
 /**
@@ -33,17 +31,13 @@ public ProofContainer getContainer(ProofId proofId) {
     }
 
     public KeYEnvironment<?> find(EnvironmentId envid) {
-        return Objects.requireNonNull(getContainer(envid).env.get(),
-            "Environment was removed by gc");
+        return getContainer(envid).env;
     }
 
-    @NonNull
     public Proof find(ProofId proofId) {
-        return Objects.requireNonNull(getContainer(proofId).wProof.get(),
-            "Could not find a proof for id " + proofId);
+        return getContainer(proofId).wProof;
     }
 
-    @NonNull
     public NodeText find(NodeTextId nodeTextId) {
         return Objects.requireNonNull(
             getContainer(nodeTextId.nodeId().proofId()).mapGoalText.get(nodeTextId),
@@ -69,7 +63,6 @@ public void dispose(EnvironmentId id) {
     }
 
     public Node find(NodeId nodeId) {
-        @NonNull
         Proof p = find(nodeId.proofId);
         var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
         return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
@@ -109,7 +102,8 @@ public record EnvironmentId(String envId) implements KeYDataTransferObject {
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record ContractId(EnvironmentId envId, String contractId) implements KeYDataTransferObject {
+    public record ContractId(EnvironmentId envId, String contractId)
+            implements KeYDataTransferObject {
     }
 
     /**
@@ -134,7 +128,8 @@ public record NodeTextId(NodeId nodeId, int nodeTextId) implements KeYDataTransf
      * @author Alexander Weigl
      * @version 1 (13.10.23)
      */
-    public record TermActionId(NodeId nodeId, String pio, String id) implements KeYDataTransferObject {
+    public record TermActionId(NodeId nodeId, String pio, String id)
+            implements KeYDataTransferObject {
     }
 
     /**
@@ -149,27 +144,25 @@ public record TreeNodeId(String id) implements KeYDataTransferObject {
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record KeyEnvironmentContainer(WeakReference<KeYEnvironment<?>> env,
-                                          BiMap<ProofId, ProofContainer> mapProof
-    ) {
+    public record KeyEnvironmentContainer(KeYEnvironment<?> env,
+            BiMap<ProofId, ProofContainer> mapProof) {
 
         public KeyEnvironmentContainer(KeYEnvironment<?> env) {
-            this(new WeakReference<>(env), HashBiMap.create(1));
+            this(env, HashBiMap.create(1));
         }
 
         void dispose() {
-            env.clear();
             mapProof.clear();
+            env.dispose();
         }
     }
 
-    private record ProofContainer(WeakReference<Proof> wProof,
-                                  BiMap<NodeId, WeakReference<Node>> mapNode,
-                                  BiMap<TreeNodeId, WeakReference<TreeNodeDesc>> mapTreeNode,
-                                  BiMap<NodeTextId, NodeText> mapGoalText
-    ) {
+    private record ProofContainer(Proof wProof,
+            BiMap<NodeId, Node> mapNode,
+            BiMap<TreeNodeId, TreeNodeDesc> mapTreeNode,
+            BiMap<NodeTextId, NodeText> mapGoalText) {
         public ProofContainer(Proof proof) {
-            this(new WeakReference<>(proof), HashBiMap.create(16), HashBiMap.create(16), HashBiMap.create(16));
+            this(proof, HashBiMap.create(16), HashBiMap.create(16), HashBiMap.create(16));
         }
 
         void dispose() {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 99ee1cad8bf..2241204b588 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -14,4 +14,6 @@
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(File problemFile, List<File> classPath, File bootClassPath, List<File> includes) implements KeYDataTransferObject {}
+public record LoadParams(File problemFile, List<File> classPath, File bootClassPath,
+        List<File> includes) implements KeYDataTransferObject {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index 35ae69e98b1..c6e788480ec 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -11,7 +11,8 @@
  * @param description
  * @param category
  */
-public record MacroDescription(String name, String description, String category) implements KeYDataTransferObject {
+public record MacroDescription(String name, String description, String category)
+        implements KeYDataTransferObject {
     public static MacroDescription from(ProofMacro m) {
         return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
index 28d782c4033..ac4b75275a9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -10,8 +10,10 @@
  * @version 1 (13.10.23)
  */
 public record MacroStatistic(KeyIdentifications.ProofId proofId, String macroId, int appliedRules,
-                             int closedGoals) implements KeYDataTransferObject {
-    public static MacroStatistic from(KeyIdentifications.ProofId proofId, ProofMacroFinishedInfo info) {
-        return new MacroStatistic(proofId, info.getMacro().getName(), info.getAppliedRules(), info.getClosedGoals());
+        int closedGoals) implements KeYDataTransferObject {
+    public static MacroStatistic from(KeyIdentifications.ProofId proofId,
+            ProofMacroFinishedInfo info) {
+        return new MacroStatistic(proofId, info.getMacro().getName(), info.getAppliedRules(),
+            info.getClosedGoals());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index 74323069725..f86b1b90e2e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -12,12 +12,13 @@
  * @version 1 (13.10.23)
  */
 public record NodeDesc(KeyIdentifications.NodeId nodeid,
-                       String branchLabel,
-                       boolean scriptRuleApplication,
-                       @Nullable List<NodeDesc> children,
-                       String description
-) implements KeYDataTransferObject {
-    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel, boolean scriptRuleApplication, String description) {
-        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication, null, description);
+        String branchLabel,
+        boolean scriptRuleApplication,
+        @Nullable List<NodeDesc> children,
+        String description) implements KeYDataTransferObject {
+    public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel,
+            boolean scriptRuleApplication, String description) {
+        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication,
+            null, description);
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
index fdb7d2d0e87..89c53274b64 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -8,5 +8,6 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result) implements KeYDataTransferObject  {
+public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result)
+        implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
index 7ac7ba933f8..6397f247821 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -17,6 +17,5 @@ public record ProblemDefinition(
         @Nullable List<FunctionDesc> functions,
         @Nullable List<PredicateDesc> predicates,
         @Nullable List<String> antecTerms,
-        @Nullable List<String> succTerms
-) implements KeYDataTransferObject {
+        @Nullable List<String> succTerms) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
index e1a57f2af26..34f0e21f2a0 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -9,9 +9,10 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record ProofMacroDesc(String name, String category, String description, String scriptCommandName) implements KeYDataTransferObject {
+public record ProofMacroDesc(String name, String category, String description,
+        String scriptCommandName) implements KeYDataTransferObject {
     public static ProofMacroDesc from(ProofMacro proofMacro) {
         return new ProofMacroDesc(proofMacro.getName(), proofMacro.getCategory(),
-                proofMacro.getDescription(), proofMacro.getScriptCommandName());
+            proofMacro.getDescription(), proofMacro.getScriptCommandName());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index 38da636bb44..2e59afc29dd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -9,8 +9,10 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record ProofScriptCommandDesc(String macroId, String documentation) implements KeYDataTransferObject {
+public record ProofScriptCommandDesc(String macroId, String documentation)
+        implements KeYDataTransferObject {
     public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
-        return new ProofScriptCommandDesc(proofScriptCommand.getName(), proofScriptCommand.getDocumentation());
+        return new ProofScriptCommandDesc(proofScriptCommand.getName(),
+            proofScriptCommand.getDocumentation());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
index 160001b7a33..4a9ad7d94fe 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -5,7 +5,8 @@
 
 import de.uka.ilkd.key.proof.Proof;
 
-public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals) implements KeYDataTransferObject {
+public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals)
+        implements KeYDataTransferObject {
     public static ProofStatus from(KeyIdentifications.ProofId id, Proof proof) {
         return new ProofStatus(id, proof.openGoals().size(), proof.closedGoals().size());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
index 6048b2803e2..212d8248567 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -12,11 +12,11 @@
  * @version 1 (13.10.23)
  */
 public record SortDesc(String string, String documentation,
-                       List<SortDesc> extendsSorts,
-                       boolean anAbstract, String s) implements KeYDataTransferObject {
+        List<SortDesc> extendsSorts,
+        boolean anAbstract, String s) implements KeYDataTransferObject {
     public static SortDesc from(Sort sort) {
         return new SortDesc(sort.name().toString(), sort.getDocumentation(),
-                sort.extendsSorts().stream().map(SortDesc::from).toList(),
-                sort.isAbstract(), sort.declarationString());
+            sort.extendsSorts().stream().map(SortDesc::from).toList(),
+            sort.isAbstract(), sort.declarationString());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
index 0539caacd3a..ab65233fea5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StrategyOptions.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import java.lang.reflect.Field;
+
 import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.settings.ProofSettings;
 import de.uka.ilkd.key.settings.StrategySettings;
 import de.uka.ilkd.key.strategy.StrategyProperties;
 
-import java.lang.reflect.Field;
-
 /**
  * @author Alexander Weigl
  * @version 1 (13.10.23)
@@ -23,24 +22,25 @@ public record StrategyOptions(
         int maxSteps) implements KeYDataTransferObject {
     public static StrategyOptions defaultOptions() {
         return new StrategyOptions(
-                "METHOD_CONTRACT",
-                "DEP_ON",
-                "QUERY_ON",
-                "NON_LIN_ARITH_DEF_OPS",
-                "STOPMODE_NONCLOSE",
-                1000
-        );
+            "METHOD_CONTRACT",
+            "DEP_ON",
+            "QUERY_ON",
+            "NON_LIN_ARITH_DEF_OPS",
+            "STOPMODE_NONCLOSE",
+            1000);
     }
+
     public static StrategyOptions from(StrategySettings settings) {
         var sp = settings.getActiveStrategyProperties();
         return new StrategyOptions(
-                sp.getProperty(StrategyProperties.METHOD_OPTIONS_KEY),
-                sp.getProperty(StrategyProperties.DEP_OPTIONS_KEY),
-                sp.getProperty(StrategyProperties.QUERY_OPTIONS_KEY),
-                sp.getProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY),
-                sp.getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY),
-                settings.getMaxSteps());
+            sp.getProperty(StrategyProperties.METHOD_OPTIONS_KEY),
+            sp.getProperty(StrategyProperties.DEP_OPTIONS_KEY),
+            sp.getProperty(StrategyProperties.QUERY_OPTIONS_KEY),
+            sp.getProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY),
+            sp.getProperty(StrategyProperties.STOPMODE_OPTIONS_KEY),
+            settings.getMaxSteps());
     }
+
     private String getVal(String key) {
         Field f = null;
         try {
@@ -59,6 +59,7 @@ private String getVal(String key) {
             throw new RuntimeException("Type mismatch: " + t);
         }
     }
+
     public void configure(Proof proof) {
         var defaultOptions = defaultOptions();
         StrategyProperties sp = proof.getSettings().getStrategySettings()
@@ -81,7 +82,8 @@ public void configure(Proof proof) {
         if (nonLinArith != null) {
             sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY, getVal(nonLinArith));
         } else {
-            sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY, defaultOptions.nonLinArith());
+            sp.setProperty(StrategyProperties.NON_LIN_ARITH_OPTIONS_KEY,
+                defaultOptions.nonLinArith());
         }
         if (stopMode != null) {
             sp.setProperty(StrategyProperties.STOPMODE_OPTIONS_KEY, getVal(stopMode));
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index 762d2a71eae..7b265a20fbb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -10,8 +10,10 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
-public record TreeNodeDesc(KeyIdentifications.NodeId id, String name) implements KeYDataTransferObject {
+public record TreeNodeDesc(KeyIdentifications.NodeId id, String name)
+        implements KeYDataTransferObject {
     public static TreeNodeDesc from(KeyIdentifications.ProofId proofId, Node root) {
-        return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, root.serialNr()), root.name());
+        return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, root.serialNr()),
+            root.name());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
index 4144c9e6877..845c485ca7e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -8,5 +8,5 @@
  * @version 1 (29.10.23)
  */
 public record PrintOptions(boolean unicode, int width, int indentation, boolean pure,
-                           boolean termLabels) {
+        boolean termLabels) {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
index d1ae6245f0d..a399c097d2a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -12,7 +12,6 @@ record LogMessageParams(
         /**
          * The actual message
          */
-        String message
-) {
+        String message) {
 
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
index 9328544be6c..a9f9bde6315 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -9,14 +9,12 @@ public record LogTraceParams(
         /**
          * The message to be logged.
          */
-        @NonNull
-        String messag,
+        @NonNull String messag,
 
         /**
          * Additional information that can be computed if the `trace` configuration
          * is set to `'verbose'`
          */
-        String verbose
-) {
+        String verbose) {
 
-}
\ No newline at end of file
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
index 79e94cc39bb..e6948bf3dec 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -7,6 +7,5 @@ public record MessageActionItem(
         /**
          * A short title like 'Retry', 'Open Log' etc.
          */
-        String title
-) {
-}
\ No newline at end of file
+        String title) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index 1e3050bbfde..919ed5b645d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -32,7 +32,6 @@ public record ShowDocumentParams(
          * external program is started or the file is not a text
          * file.
          */
-        Range selection
-) {
+        Range selection) {
 
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
index bb455cbebd5..616a0332897 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -7,7 +7,6 @@ public record ShowDocumentResult(
         /**
          * A boolean indicating if the show was successful.
          */
-        boolean success
-) {
+        boolean success) {
 
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 6dcc7164acc..3341b146701 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -20,6 +20,5 @@ public record ShowMessageRequestParams(
          * The message action items to present.
          *
          */
-        List<MessageActionItem> actions
-) {
-}
\ No newline at end of file
+        List<MessageActionItem> actions) {
+}

From 954ffe588586edf50cd4a780c8dbb3788a40cd74 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Tue, 8 Jul 2025 15:09:49 +0200
Subject: [PATCH 42/50] fix compile error

---
 .../AbstractSymbolicExecutionTestCase.java    | 120 +++++++-----------
 .../main/java/de/uka/ilkd/key/proof/Goal.java |   5 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |  36 +++---
 .../keyproject/key/api/TermActionUtil.java    |   3 +-
 .../keyproject/key/api/data/LoadParams.java   |   9 +-
 .../key/api/data/ProofScriptCommandDesc.java  |   2 +-
 .../key/api/data/TaskFinishedInfo.java        |   7 +-
 .../key/api/data/TaskStartedInfo.java         |   8 +-
 .../org/keyproject/key/api/SimpleClient.java  |   5 +-
 .../formal/keyextclientjava/MyKeyClient.java  |  16 +--
 .../ProofExplorationServiceTest.java          |   9 +-
 11 files changed, 91 insertions(+), 129 deletions(-)

diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
index 02fbf0604ef..56933b36ff7 100644
--- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
+++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java
@@ -1136,17 +1136,12 @@ protected static void stepReturn(DefaultUserInterfaceControl ui,
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        try {
-            ui.getProofControl().startAndWaitForAutoMode(proof);
-            // Update symbolic execution tree
-            builder.analyse();
-            // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
-                oracleFileExtension,
-                baseDir);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        ui.getProofControl().startAndWaitForAutoMode(proof);
+        // Update symbolic execution tree
+        builder.analyse();
+        // Test result
+        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+            baseDir);
     }
 
 
@@ -1179,18 +1174,13 @@ protected static void stepReturnWithBreakpoints(DefaultUserInterfaceControl ui,
         stopCondition.addChildren(lineBreakpoints);
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        try {
-            // Run proof
-            ui.getProofControl().startAndWaitForAutoMode(proof);
-            // Update symbolic execution tree
-            builder.analyse();
-            // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
-                oracleFileExtension,
-                baseDir);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        // Run proof
+        ui.getProofControl().startAndWaitForAutoMode(proof);
+        // Update symbolic execution tree
+        builder.analyse();
+        // Test result
+        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+            baseDir);
     }
 
     /**
@@ -1221,18 +1211,13 @@ protected static void stepOver(DefaultUserInterfaceControl ui,
         stopCondition.addChildren(new StepOverSymbolicExecutionTreeNodesStopCondition());
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
-        try {
-            // Run proof
-            ui.getProofControl().startAndWaitForAutoMode(proof);
-            // Update symbolic execution tree
-            builder.analyse();
-            // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
-                oracleFileExtension,
-                baseDir);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        // Run proof
+        ui.getProofControl().startAndWaitForAutoMode(proof);
+        // Update symbolic execution tree
+        builder.analyse();
+        // Test result
+        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+            baseDir);
     }
 
     /**
@@ -1264,19 +1249,13 @@ protected static SymbolicExecutionCompletions stepInto(DefaultUserInterfaceContr
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        try {
-            ui.getProofControl().startAndWaitForAutoMode(proof);
-
-            // Update symbolic execution tree
-            SymbolicExecutionCompletions completions = builder.analyse();
-            // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex,
-                oracleFileExtension,
-                baseDir);
-            return completions;
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        ui.getProofControl().startAndWaitForAutoMode(proof);
+        // Update symbolic execution tree
+        SymbolicExecutionCompletions completions = builder.analyse();
+        // Test result
+        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, oracleIndex, oracleFileExtension,
+            baseDir);
+        return completions;
     }
 
     /**
@@ -1304,16 +1283,11 @@ protected static void resume(DefaultUserInterfaceControl ui,
         proof.getSettings().getStrategySettings()
                 .setCustomApplyStrategyStopCondition(stopCondition);
         // Run proof
-        try {
-            ui.getProofControl().startAndWaitForAutoMode(proof);
-
-            // Update symbolic execution tree
-            builder.analyse();
-            // Test result
-            assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        ui.getProofControl().startAndWaitForAutoMode(proof);
+        // Update symbolic execution tree
+        builder.analyse();
+        // Test result
+        assertSetTreeAfterStep(builder, oraclePathInBaseDirFile, baseDir);
     }
 
     /**
@@ -2211,24 +2185,18 @@ private void internalDoSETTest(Path oracleFile,
         // Execute auto mode until no more symbolic execution tree nodes are found or no new rules
         // are applied.
         do {
-            try {
-                // Store the number of nodes before start of the auto mode
-                nodeCount = env.getProof().countNodes();
-                // Run proof
-                env.getProofControl().startAndWaitForAutoMode(env.getProof());
-
-                // Update symbolic execution tree
-                env.getBuilder().analyse();
-                // Make sure that not to many set nodes are executed
-                Map<Goal, Integer> executedSetNodesPerGoal =
-                    stopCondition.getExectuedSetNodesPerGoal();
-                for (Integer value : executedSetNodesPerGoal.values()) {
-                    assertNotNull(value);
-                    assertTrue(value <= maximalNumberOfExecutedSetNodes,
-                        value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
-                }
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+            // Store the number of nodes before start of the auto mode
+            nodeCount = env.getProof().countNodes();
+            // Run proof
+            env.getProofControl().startAndWaitForAutoMode(env.getProof());
+            // Update symbolic execution tree
+            env.getBuilder().analyse();
+            // Make sure that not to many set nodes are executed
+            Map<Goal, Integer> executedSetNodesPerGoal = stopCondition.getExectuedSetNodesPerGoal();
+            for (Integer value : executedSetNodesPerGoal.values()) {
+                assertNotNull(value);
+                assertTrue(value <= maximalNumberOfExecutedSetNodes,
+                    value + " is not less equal to " + maximalNumberOfExecutedSetNodes);
             }
         } while (stopCondition.wasSetNodeExecuted() && nodeCount != env.getProof().countNodes());
         // Create new oracle file if required in a temporary directory
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
index fda16b07e96..fe07a817519 100644
--- a/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
+++ b/key.core/src/main/java/de/uka/ilkd/key/proof/Goal.java
@@ -15,10 +15,7 @@
 import de.uka.ilkd.key.proof.mgt.RuleJustification;
 import de.uka.ilkd.key.proof.proofevent.NodeChangeJournal;
 import de.uka.ilkd.key.proof.proofevent.RuleAppInfo;
-import de.uka.ilkd.key.rule.AbstractExternalSolverRuleApp;
-import de.uka.ilkd.key.rule.IBuiltInRuleApp;
-import de.uka.ilkd.key.rule.NoPosTacletApp;
-import de.uka.ilkd.key.rule.TacletApp;
+import de.uka.ilkd.key.rule.*;
 import de.uka.ilkd.key.rule.inst.SVInstantiations;
 import de.uka.ilkd.key.rule.merge.MergeRule;
 import de.uka.ilkd.key.strategy.QueueRuleApplicationManager;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 0915aba9b7b..9464f092314 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -21,25 +21,27 @@
 import de.uka.ilkd.key.gui.ExampleChooser;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.macros.scripts.ProofScriptEngine;
-import de.uka.ilkd.key.macros.scripts.ScriptException;
-import de.uka.ilkd.key.parser.Location;
+import de.uka.ilkd.key.nparser.ParsingFacade;
 import de.uka.ilkd.key.pp.IdentitySequentPrintFilter;
 import de.uka.ilkd.key.pp.LogicPrinter;
 import de.uka.ilkd.key.pp.NotationInfo;
 import de.uka.ilkd.key.pp.PosTableLayouter;
-import de.uka.ilkd.key.proof.*;
+import de.uka.ilkd.key.proof.Goal;
+import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
+import de.uka.ilkd.key.proof.ProofAggregate;
 import de.uka.ilkd.key.proof.init.*;
 import de.uka.ilkd.key.proof.io.AbstractProblemLoader;
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.prover.ProverTaskListener;
-import de.uka.ilkd.key.prover.TaskFinishedInfo;
-import de.uka.ilkd.key.prover.TaskStartedInfo;
+import de.uka.ilkd.key.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.scripts.ProofScriptEngine;
+import de.uka.ilkd.key.scripts.ScriptException;
 import de.uka.ilkd.key.speclang.PositionedString;
 import de.uka.ilkd.key.strategy.StrategyProperties;
 import de.uka.ilkd.key.util.KeYConstants;
 
+import org.key_project.prover.engine.ProverTaskListener;
+import org.key_project.prover.engine.TaskFinishedInfo;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSet;
 import org.key_project.util.reflection.ClassLoaderUtil;
@@ -65,7 +67,7 @@ public final class KeyApiImpl implements KeyApi {
     private ClientApi clientApi;
     private final ProverTaskListener clientListener = new ProverTaskListener() {
         @Override
-        public void taskStarted(TaskStartedInfo info) {
+        public void taskStarted(org.key_project.prover.engine.TaskStartedInfo info) {
             clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
@@ -139,11 +141,12 @@ public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLi
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
-            var pe = new ProofScriptEngine(scriptLine, Location.UNDEFINED);
+            var script = ParsingFacade.parseScript(scriptLine);
+            var pe = new ProofScriptEngine(script);
 
             try {
                 pe.execute((AbstractUserInterfaceControl) env.getProofControl(), proof);
-                return null;
+                return new MacroStatistic(proofId, scriptLine, -1, -1);
             } catch (IOException | InterruptedException | ScriptException e) {
                 throw new RuntimeException(e);
             }
@@ -408,7 +411,8 @@ public CompletableFuture<ProofId> loadExample(String id) {
                 KeYEnvironment<?> env = null;
                 try {
                     var loader = control.load(JavaProfile.getDefaultProfile(),
-                        ex.getObligationFile(), null, null, null, null, true, null);
+                        ex.getObligationFile().toPath(),
+                        null, null, null, null, true, null);
                     InitConfig initConfig = loader.getInitConfig();
 
                     env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
@@ -460,7 +464,7 @@ public CompletableFuture<ProofId> loadKey(String content) {
                 final var tempFile = File.createTempFile("json-rpc-", ".key");
                 Files.writeString(tempFile.toPath(), content);
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                    tempFile, null, null, null, null, true, null);
+                    tempFile.toPath(), null, null, null, null, true, null);
                 InitConfig initConfig = loader.getInitConfig();
                 env = new KeYEnvironment<>(control, initConfig, loader.getProof(),
                     loader.getProofScript(), loader.getResult());
@@ -515,7 +519,7 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
 
     private class MyDefaultUserInterfaceControl extends DefaultUserInterfaceControl {
         @Override
-        public void taskStarted(TaskStartedInfo info) {
+        public void taskStarted(org.key_project.prover.engine.TaskStartedInfo info) {
             clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
@@ -525,12 +529,12 @@ public void taskProgress(int position) {
         }
 
         @Override
-        public void taskFinished(TaskFinishedInfo info) {
+        public void taskFinished(org.key_project.prover.engine.TaskFinishedInfo info) {
             clientApi.taskFinished(org.keyproject.key.api.data.TaskFinishedInfo.from(info));
         }
 
         @Override
-        protected void macroStarted(TaskStartedInfo info) {
+        protected void macroStarted(org.key_project.prover.engine.TaskStartedInfo info) {
             clientApi.taskStarted(org.keyproject.key.api.data.TaskStartedInfo.from(info));
         }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index 9ce67460203..75f3c029516 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -9,13 +9,13 @@
 
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.control.ProofControl;
-import de.uka.ilkd.key.logic.PosInOccurrence;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.pp.PosInSequent;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.rule.*;
 
 import org.key_project.logic.Name;
+import org.key_project.prover.sequent.PosInOccurrence;
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 import org.key_project.util.reflection.ClassLoaderUtil;
@@ -36,6 +36,7 @@ public class TermActionUtil {
             new Name("obsolete"),
             new Name("pullOutQuantifierAll"),
             new Name("pullOutQuantifierEx"));
+
     private static final Set<Name> CLUTTER_RULES = Set.of(
         new Name("cut_direct_r"),
         new Name("cut_direct_l"),
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index 2241204b588..d38653a40f8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -3,17 +3,16 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 
 /**
  *
- * @param keyFile
- * @param javaFile
+ * @param problemFile
  * @param classPath
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(File problemFile, List<File> classPath, File bootClassPath,
-        List<File> includes) implements KeYDataTransferObject {
+public record LoadParams(Path problemFile, List<Path> classPath, Path bootClassPath,
+        List<Path> includes) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index 2e59afc29dd..7ab1973e3da 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
+import de.uka.ilkd.key.scripts.ProofScriptCommand;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
index bc9707ed7bc..5a4042dd009 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public record TaskFinishedInfo() implements KeYDataTransferObject {
-    public static TaskFinishedInfo from(de.uka.ilkd.key.prover.TaskFinishedInfo info) {
-        return new TaskFinishedInfo();
+public record TaskFinishedInfo(long time, int appliedRules, int closedGoals)
+        implements KeYDataTransferObject {
+    public static TaskFinishedInfo from(org.key_project.prover.engine.TaskFinishedInfo info) {
+        return new TaskFinishedInfo(info.getTime(), info.getAppliedRules(), info.getClosedGoals());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index 5b373d6b6e2..895523c3796 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -3,8 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public record TaskStartedInfo() implements KeYDataTransferObject {
-    public static TaskStartedInfo from(de.uka.ilkd.key.prover.TaskStartedInfo info) {
-        return new TaskStartedInfo();
+public record TaskStartedInfo(String message, int size,
+        org.key_project.prover.engine.TaskStartedInfo.TaskKind kind)
+        implements KeYDataTransferObject {
+    public static TaskStartedInfo from(org.key_project.prover.engine.TaskStartedInfo info) {
+        return new TaskStartedInfo(info.message(), info.size(), info.kind());
     }
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 5f2335e5ef3..14032a786fd 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -6,9 +6,8 @@
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nullable;
 
-import de.uka.ilkd.key.prover.TaskFinishedInfo;
-import de.uka.ilkd.key.prover.TaskStartedInfo;
-
+import org.keyproject.key.api.data.TaskFinishedInfo;
+import org.keyproject.key.api.data.TaskStartedInfo;
 import org.keyproject.key.api.remoteclient.*;
 
 class SimpleClient implements ClientApi {
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 39d87aec8f7..2072be846ce 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -18,8 +18,6 @@
 import javafx.stage.FileChooser;
 
 import de.uka.ilkd.key.proof.io.ProblemLoaderException;
-import de.uka.ilkd.key.prover.TaskFinishedInfo;
-import de.uka.ilkd.key.prover.TaskStartedInfo;
 
 import edu.kit.iti.formal.keyextclientjava.rpc.KeyRemote;
 import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
@@ -29,6 +27,8 @@
 import org.keyproject.key.api.StartServer;
 import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.LoadParams;
+import org.keyproject.key.api.data.TaskFinishedInfo;
+import org.keyproject.key.api.data.TaskStartedInfo;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteapi.PrintOptions;
 import org.keyproject.key.api.remoteclient.*;
@@ -102,26 +102,20 @@ private void openFile() {
         if (sel != null) {
             try {
                 loadedProof = keyApi.load(
-                    new LoadParams(sel, null, null, null, null))
+                    new LoadParams(sel.toPath(), null, null, null))
                         .get().getRight();
                 var root = keyApi.root(loadedProof).get();
                 var sequent =
                     keyApi.print(root.nodeid(), new PrintOptions(true, 80, 4, true, false))
                             .get();
                 txtSequentView.setText(sequent.result());
-            } catch (ProblemLoaderException e) {
-                throw new RuntimeException(e);
-            } catch (ExecutionException e) {
-                throw new RuntimeException(e);
-            } catch (InterruptedException e) {
+            } catch (ProblemLoaderException | ExecutionException | InterruptedException e) {
                 throw new RuntimeException(e);
             }
-
-
         }
     }
 
-    private class SimpleClient implements ClientApi {
+    private static class SimpleClient implements ClientApi {
         @Override
         public void sayHello(String e) {
 
diff --git a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
index ca1dabaf186..90b64d1b630 100644
--- a/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
+++ b/keyext.exploration/src/test/java/org/key_project/exploration/ProofExplorationServiceTest.java
@@ -180,12 +180,9 @@ public void testChangeFormula() {
         // set all goals to interactive
         justificationBranch.setEnabled(true);
         // perform proof, it has to close
-        try {
-            env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
-            assertTrue(currentProof.closed(), "Proof is closed");
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        env.getProofControl().startAndWaitForAutoMode(currentProof, newCreatedGoals);
+        assertTrue(currentProof.closed(), "Proof is closed");
+
     }
 
 

From b66c286afa1bec7cd9a5c734fd9b42fa95d00e4e Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Tue, 8 Jul 2025 19:13:27 +0200
Subject: [PATCH 43/50] documentation generation

---
 keyext.api.doc/build.gradle                   |  10 +-
 .../key/api/doc/ExtractMetaData.java          | 100 +++++-------------
 .../org/key_project/key/api/doc/Main.java     |  87 +++++++++++++++
 .../key_project/key/api/doc/Metamodel.java    |  90 +++++++++++-----
 .../key/api/doc/PythonGenerator.java          |  51 +++------
 .../key_project/key/api/doc/package-info.java |   8 ++
 6 files changed, 209 insertions(+), 137 deletions(-)
 create mode 100644 keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
 create mode 100644 keyext.api.doc/src/main/java/org/key_project/key/api/doc/package-info.java

diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index 0c275f1d19e..c3778ab3e7c 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -1,5 +1,13 @@
+plugins {
+    id "application"
+}
+
 dependencies {
     implementation(project(":keyext.api"))
     implementation("com.github.javaparser:javaparser-symbol-solver-core:3.26.1")
     implementation("info.picocli:picocli:4.7.6")
-}
\ No newline at end of file
+}
+
+application {
+    mainClass.set("org.key_project.key.api.doc.Main")
+}
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index ce10a14512c..73595881428 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -9,16 +9,10 @@
                                      */
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.*;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
-import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 import de.uka.ilkd.key.proof.Proof;
 
@@ -30,61 +24,38 @@
 import com.github.javaparser.javadoc.Javadoc;
 import com.github.javaparser.javadoc.description.JavadocDescription;
 import com.github.javaparser.utils.SourceRoot;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializer;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
-import picocli.CommandLine;
-import picocli.CommandLine.Option;
 
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
  */
-@NullMarked
-@CommandLine.Command(name = "gendoc",
-    mixinStandardHelpOptions = true,
-    version = "gendoc 1.0",
-    description = "Generates the documentation for key.api")
-public class ExtractMetaData implements Callable<Integer> {
+
+public class ExtractMetaData implements Runnable {
     private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
     private final List<Metamodel.Type> types = new LinkedList<>();
     private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
-    private SourceRoot sourceRoot = new SourceRoot(Paths.get("."));
-
-
-    @Option(names = { "-s", "--source" }, description = "Source folder for getting JavaDoc")
-    private @Nullable Path source = Paths.get("keyext.api", "src", "main", "java");
-
-    @Option(names = { "-o", "--output" }, description = "Output folder")
-    private Path output = Paths.get("out");
-
-    public static void main(String[] args) {
-        int exitCode = new CommandLine(new ExtractMetaData()).execute(args);
-        System.exit(exitCode);
+    private final SourceRoot sourceRoot;
+
+    public ExtractMetaData(Path source) {
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21);
+        config.setAttributeComments(true);
+        config.setLexicalPreservationEnabled(false);
+        config.setStoreTokens(false);
+        config.setIgnoreAnnotationsWhenAttributingComments(true);
+        config.setDoNotAssignCommentsPrecedingEmptyLines(true);
+        sourceRoot = new SourceRoot(source, config);
     }
 
     @Override
-    public Integer call() throws IOException {
-        if (source != null) {
-            ParserConfiguration config = new ParserConfiguration();
-            config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21);
-            config.setAttributeComments(true);
-            config.setLexicalPreservationEnabled(false);
-            config.setStoreTokens(false);
-            config.setIgnoreAnnotationsWhenAttributingComments(true);
-            config.setDoNotAssignCommentsPrecedingEmptyLines(true);
-            sourceRoot = new SourceRoot(source, config);
-        }
-
+    public void run() {
         for (Method method : KeyApi.class.getMethods()) {
             addServerEndpoint(method);
         }
@@ -92,36 +63,6 @@ public Integer call() throws IOException {
         for (Method method : ClientApi.class.getMethods()) {
             addClientEndpoint(method);
         }
-
-        Files.createDirectories(output);
-
-        runGenerator("api.meta.json", (a) -> () -> getGson().toJson(a));
-        runGenerator("api.meta.md", DocGen::new);
-        runGenerator("keydata.py", PythonGenerator.PyDataGen::new);
-        runGenerator("server.py", PythonGenerator.PyApiGen::new);
-
-        return 0;
-    }
-
-    private void runGenerator(String target, Function<Metamodel.KeyApi, Supplier<String>> api) {
-        try {
-            var n = api.apply(keyApi);
-            Files.writeString(output.resolve(target), n.get());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static Gson getGson() {
-        return new GsonBuilder()
-                .setPrettyPrinting()
-                .registerTypeAdapter(Type.class,
-                    (JsonSerializer<Metamodel.Type>) (src, typeOfSrc, context) -> {
-                        JsonObject json = (JsonObject) context.serialize(src);
-                        json.addProperty("kind", src.kind());
-                        return json;
-                    })
-                .create();
     }
 
     private void addServerEndpoint(Method method) {
@@ -188,6 +129,12 @@ private Metamodel.Type getOrFindType(Class<?> type) {
             return getOrFindType(type.getTypeParameters()[0].getClass());
         }
 
+        if(type == List.class) {
+            // TODO try to get the type below.
+            var subType = getOrFindType(type.getTypeParameters()[0].getClass());
+            return new Metamodel.ListType(subType, "");
+        }
+
         if (type == Class.class || type == Constructor.class || type == Proof.class) {
             throw new IllegalStateException("Forbidden class reached!");
         }
@@ -218,7 +165,6 @@ private Metamodel.Type getOrFindType(Class<?> type) {
         if (type == Character.TYPE)
             return Metamodel.BuiltinType.LONG;
 
-        System.out.println(type);
         var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
         if (t.isPresent())
             return t.get();
@@ -263,7 +209,7 @@ private Optional<TypeDeclaration<?>> findCompilationUnit(Class<?> type) {
 
     private void addClientEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
-        var segment = jsonSegment.value();
+        var segment = jsonSegment == null ? "" : jsonSegment.value();
 
         var req = method.getAnnotation(JsonRequest.class);
         var resp = method.getAnnotation(JsonNotification.class);
@@ -326,4 +272,8 @@ private static String callMethodName(String method, String segment, @Nullable St
         }
         return null;
     }
+
+    public Metamodel.KeyApi getApi() {
+        return keyApi;
+    }
 }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
new file mode 100644
index 00000000000..881040af25e
--- /dev/null
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
@@ -0,0 +1,87 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+package org.key_project.key.api.doc;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.key_project.key.api.doc.Metamodel.Endpoint;
+import org.key_project.key.api.doc.Metamodel.Type;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializer;
+import org.jspecify.annotations.Nullable;
+import picocli.CommandLine;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (7/8/25)
+ */
+@CommandLine.Command(name = "gendoc",
+    mixinStandardHelpOptions = true,
+    version = "gendoc 1.0",
+    description = "Generates the documentation for key.api")
+public class Main implements Callable<Integer> {
+    @CommandLine.Option(names = {"-s", "--source"},
+            description = "Source folder for getting JavaDoc")
+    private @Nullable Path source = Paths.get("..", "keyext.api", "src", "main", "java");
+
+    @CommandLine.Option(names = { "-o", "--output" }, description = "Output folder")
+    private Path output = Paths.get("out");
+
+    public static void main(String[] args) {
+        int exitCode = new CommandLine(new Main()).execute(args);
+        System.exit(exitCode);
+    }
+
+    @Override
+    public Integer call() throws IOException {
+        var metadata = new ExtractMetaData(Objects.requireNonNull(source));
+        metadata.run();
+        Files.createDirectories(output);
+
+        runGenerator(metadata.getApi(), "api.meta.json", (a) -> () -> getGson().toJson(a));
+        runGenerator(metadata.getApi(), "api.meta.md", DocGen::new);
+        runGenerator(metadata.getApi(), "keydata.py", PythonGenerator.PyDataGen::new);
+        runGenerator(metadata.getApi(), "server.py", PythonGenerator.PyApiGen::new);
+        return 0;
+    }
+
+
+    private void runGenerator(Metamodel.KeyApi keyApi, String target,
+            Function<Metamodel.KeyApi, Supplier<String>> api) {
+        try {
+            var n = api.apply(keyApi);
+            Files.writeString(output.resolve(target), n.get());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static Gson getGson() {
+        return new GsonBuilder()
+                .setPrettyPrinting()
+                .registerTypeAdapter(Type.class,
+                    (JsonSerializer<Type>) (src, typeOfSrc, context) -> {
+                        JsonObject json = (JsonObject) context.serialize(src);
+                        json.addProperty("kind", src.kind());
+                        return json;
+                    })
+                .registerTypeAdapter(Endpoint.class,
+                    (JsonSerializer<Endpoint>) (src, typeOfSrc, context) -> {
+                        JsonObject json = (JsonObject) context.serialize(src);
+                        json.addProperty("kind", src.kind());
+                        return json;
+                    })
+                .create();
+    }
+}
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index 13f0e0573e3..afda1b51c7d 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -1,84 +1,104 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.key_project.key.api.doc;/*
-                                     * This file is part of KeY - https://key-project.org
-                                     * KeY is licensed under the GNU General Public License Version
-                                     * 2
-                                     * SPDX-License-Identifier: GPL-2.0-only
-                                     */
+package org.key_project.key.api.doc;
 
 import java.util.List;
 
 import org.jspecify.annotations.NullMarked;
 
-/**
- * @author Alexander Weigl
- * @version 1 (29.10.23)
- */
+/// Metamodel of the API. This class contains classes which represents the functionality and
+/// interfaces of the API.
+///
+/// @author Alexander Weigl
+/// @version 1 (29.10.23)
 @NullMarked
 public class Metamodel {
+
+    /// Root class of the metamodel.
+    ///
+    /// @param endpoints a list of provided services
+    /// @param types a list of known types
     public record KeyApi(
             List<Endpoint> endpoints,
             List<Type> types) {
     }
 
-    sealed
-
-    interface Endpoint {
+    /// An {@link Endpoint} is a provided service/method.
+    sealed interface Endpoint {
+        /// complete name of the service
         String name();
 
+        /// a markdown documentation
         String documentation();
 
         default String kind() {
-            return getClass().getSimpleName();
+            return getClass().getName();
         }
 
+        /// a list of its arguments
         List<Argument> args();
     }
 
+    /// A [Argument] of an endpoint
+    ///
+    /// @param name the argument name
+    /// @param type the argument type
     public record Argument(String name, String type) {
     }
 
-    record ServerRequest(String name, String documentation, List<Argument> args, Type returnType)
+    /// A {@link ServerRequest} is the caller to the callee expecting an answer.
+    ///
+    /// @param name
+    /// @param args
+    /// @param documentation
+    /// @param returnType
+    public record ServerRequest(String name, String documentation, List<Argument> args,
+            Type returnType)
             implements Endpoint {
     }
 
-    record ServerNotification(String name, String documentation, List<Argument> args)
+    ///
+    public record ServerNotification(String name, String documentation, List<Argument> args)
             implements Endpoint {
     }
 
-    record ClientRequest(String name, String documentation, List<Argument> args, Type returnType)
+    ///
+    public record ClientRequest(String name, String documentation, List<Argument> args,
+            Type returnType)
             implements Endpoint {
     }
 
-    record ClientNotification(String name, String documentation, List<Argument> args)
+    ///
+    public record ClientNotification(String name, String documentation, List<Argument> args)
             implements Endpoint {
     }
 
-    record Field(String name, /* Type */ String type, String documentation) {
-
+    ///
+    public record Field(String name, /* Type */ String type, String documentation) {
         Field(String name, String type) {
             this(name, type, "");
         }
     }
 
-    public sealed
-
-
-    interface Type {
+    /// A data type
+    public sealed interface Type {
         default String kind() {
             return getClass().getName();
         }
 
+        /// Documentation of the data type
         String documentation();
 
+        /// name of the data type
         String name();
 
+        ///
         String identifier();
     }
 
 
+    /// Typical built-in data types supported by the API
     enum BuiltinType implements Type {
         INT, LONG, STRING, BOOL, DOUBLE;
 
@@ -93,8 +113,11 @@ public String identifier() {
 
     }
 
+    /// List of `type`.
+    ///
+    /// @param type the type of list elements
+    /// @param documentation documentation of this data type
     record ListType(Type type, String documentation) implements Type {
-
         @Override
         public String name() {
             return type().name() + "[]";
@@ -106,6 +129,12 @@ public String identifier() {
 
     }
 
+    /// Data type of objects or struct or record.
+    ///
+    /// @param typeName short type name
+    /// @param typeFullName fully-qualified type name
+    /// @param fields list of fields
+    /// @param documentation documentation of data type
     record ObjectType(String typeName, String typeFullName, List<Field> fields,
             String documentation) implements Type {
 
@@ -119,6 +148,11 @@ public String identifier() {
         }
     }
 
+    /// A data type representing that a method returns or expecting either type `a` or `b`.
+    ///
+    /// @param a
+    /// @param b
+    /// @param documentation
     public record EitherType(Type a, Type b, String documentation) implements Type {
 
         @Override
@@ -132,6 +166,12 @@ public String identifier() {
 
     }
 
+    /// Enumeration data type
+    ///
+    /// @param typeName short name of the data type
+    /// @param typeFullName fully-qualified name
+    /// @param values possible values of the enum
+    /// @param documentation documentation of the data type
     public record EnumType(String typeName, String typeFullName, List<String> values,
             String documentation) implements Type {
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 1a58a122db2..e5d668c45c3 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -1,12 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.key_project.key.api.doc;/*
-                                     * This file is part of KeY - https://key-project.org
-                                     * KeY is licensed under the GNU General Public License Version
-                                     * 2
-                                     * SPDX-License-Identifier: GPL-2.0-only
-                                     */
+package org.key_project.key.api.doc;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -21,8 +16,8 @@
  */
 public abstract class PythonGenerator implements Supplier<String> {
     protected final Metamodel.KeyApi metamodel;
-    protected PrintWriter out;
     protected final StringWriter target = new StringWriter();
+    protected final PrintWriter out = new PrintWriter(target);
 
     public PythonGenerator(Metamodel.KeyApi metamodel) {
         this.metamodel = metamodel;
@@ -30,10 +25,7 @@ public PythonGenerator(Metamodel.KeyApi metamodel) {
 
     @Override
     public String get() {
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-            run();
-        }
+        run();
         return target.toString();
     }
 
@@ -53,23 +45,19 @@ protected String asPython(String typeName) {
     }
 
     protected String asPython(Metamodel.Type t) {
-        if (t instanceof Metamodel.ListType lt) {
-            return "typing.List[" + asPython(lt.type()) + "]";
-        }
-
-        if (t instanceof Metamodel.EitherType lt) {
-            return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
-        }
+        return switch (t) {
+        case Metamodel.ListType lt -> "typing.List[" + asPython(lt.type()) + "]";
+        case Metamodel.EitherType lt ->
+            "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+        case Metamodel.BuiltinType bt -> switch (bt) {
+        case INT, LONG -> "int";
+        case STRING -> "str";
+        case BOOL -> "bool";
+        case DOUBLE -> "float";
+        };
+        default -> t.name();
+        };
 
-        if (t instanceof Metamodel.BuiltinType bt) {
-            return switch (bt) {
-            case INT, LONG -> "int";
-            case STRING -> "str";
-            case BOOL -> "bool";
-            case DOUBLE -> "float";
-            };
-        }
-        return t.name();
     }
 
     protected Metamodel.Type findType(String typeName) {
@@ -179,15 +167,6 @@ public PyDataGen(Metamodel.KeyApi metamodel) {
             super(metamodel);
         }
 
-        @Override
-        public String get() {
-            try (var out = new PrintWriter(target)) {
-                this.out = out;
-                run();
-            }
-            return target.toString();
-        }
-
         protected void run() {
             out.format("""
                     from __future__ import annotations
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/package-info.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/package-info.java
new file mode 100644
index 00000000000..1722df1f0cf
--- /dev/null
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (7/8/25)
+ */
+@NullMarked
+package org.key_project.key.api.doc;
+
+import org.jspecify.annotations.NullMarked;

From 692b017894c1064a5b37a5a78e38c4c895704929 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 15 Aug 2025 08:15:22 +0200
Subject: [PATCH 44/50] repair build.gradle

---
 keyext.api/build.gradle | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 3cb0d2ecc45..9f0349305cd 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -3,12 +3,15 @@ plugins {
 
     // Used to create a single executable jar file with all dependencies
     // see task "shadowJar" below
-    // https://imperceptiblethoughts.com/shadow/
-    id 'com.github.johnrengelman.shadow' version "8.1.1"
+    // https://github.com/GradleUp/shadow
+    id 'com.gradleup.shadow' version "9.0.1"
 }
 
 description "Verification server interface via JSON-RPC"
-mainClassName ="org.keyproject.key.api.StartServer"
+
+application {
+    mainClass.set("org.keyproject.key.api.StartServer")
+}
 
 dependencies {
     api(project(":key.core"))

From 4e453c4cc5b00398818f9a10900761e299e9ac21 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 24 Aug 2025 17:43:27 +0200
Subject: [PATCH 45/50] spotless

---
 .../org/key_project/key/api/doc/DocGen.java   | 28 +++++++--------
 .../key/api/doc/ExtractMetaData.java          |  2 +-
 .../org/key_project/key/api/doc/Main.java     |  4 +--
 .../key/api/doc/PythonGenerator.java          | 36 +++++++++----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index 823d7030d4d..bab724c68b3 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -58,10 +58,10 @@ private void printHeader() {
 
     private void endpoints(Metamodel.Endpoint endpoint) {
         var direction = switch (endpoint) {
-        case Metamodel.ServerRequest sr -> "client -> server";
-        case Metamodel.ClientRequest sr -> "server -> client";
-        case Metamodel.ServerNotification sr -> "client ~~> server";
-        case Metamodel.ClientNotification sr -> "server ~~> client";
+            case Metamodel.ServerRequest sr -> "client -> server";
+            case Metamodel.ClientRequest sr -> "server -> client";
+            case Metamodel.ServerNotification sr -> "client ~~> server";
+            case Metamodel.ClientNotification sr -> "server ~~> client";
         };
 
         out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
@@ -71,16 +71,16 @@ private void endpoints(Metamodel.Endpoint endpoint) {
                 .map(it -> "%s : %s".formatted(it.name(), it.type()))
                 .collect(Collectors.joining(", "));
         switch (endpoint) {
-        case Metamodel.ServerRequest sr ->
-            out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-        case Metamodel.ClientRequest sr ->
-            out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-        case Metamodel.ServerNotification ignored ->
-            out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-        case Metamodel.ClientNotification ignored ->
-            out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
-        default -> {
-        }
+            case Metamodel.ServerRequest sr ->
+                out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+            case Metamodel.ClientRequest sr ->
+                out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+            case Metamodel.ServerNotification ignored ->
+                out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+            case Metamodel.ClientNotification ignored ->
+                out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+            default -> {
+            }
         }
         out.format("```%n");
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 73595881428..2f33337d6b2 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -129,7 +129,7 @@ private Metamodel.Type getOrFindType(Class<?> type) {
             return getOrFindType(type.getTypeParameters()[0].getClass());
         }
 
-        if(type == List.class) {
+        if (type == List.class) {
             // TODO try to get the type below.
             var subType = getOrFindType(type.getTypeParameters()[0].getClass());
             return new Metamodel.ListType(subType, "");
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
index 881040af25e..e601e2882c7 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
@@ -31,8 +31,8 @@
     version = "gendoc 1.0",
     description = "Generates the documentation for key.api")
 public class Main implements Callable<Integer> {
-    @CommandLine.Option(names = {"-s", "--source"},
-            description = "Source folder for getting JavaDoc")
+    @CommandLine.Option(names = { "-s", "--source" },
+        description = "Source folder for getting JavaDoc")
     private @Nullable Path source = Paths.get("..", "keyext.api", "src", "main", "java");
 
     @CommandLine.Option(names = { "-o", "--output" }, description = "Output folder")
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index e5d668c45c3..8ce112e9b84 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -33,29 +33,29 @@ public String get() {
 
     protected String asPython(String typeName) {
         return switch (typeName) {
-        case "INT", "LONG" -> "int";
-        case "STRING" -> "str";
-        case "BOOL" -> "bool";
-        case "DOUBLE" -> "float";
-        default -> {
-            var t = findType(typeName);
-            yield asPython(t);
-        }
+            case "INT", "LONG" -> "int";
+            case "STRING" -> "str";
+            case "BOOL" -> "bool";
+            case "DOUBLE" -> "float";
+            default -> {
+                var t = findType(typeName);
+                yield asPython(t);
+            }
         };
     }
 
     protected String asPython(Metamodel.Type t) {
         return switch (t) {
-        case Metamodel.ListType lt -> "typing.List[" + asPython(lt.type()) + "]";
-        case Metamodel.EitherType lt ->
-            "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
-        case Metamodel.BuiltinType bt -> switch (bt) {
-        case INT, LONG -> "int";
-        case STRING -> "str";
-        case BOOL -> "bool";
-        case DOUBLE -> "float";
-        };
-        default -> t.name();
+            case Metamodel.ListType lt -> "typing.List[" + asPython(lt.type()) + "]";
+            case Metamodel.EitherType lt ->
+                "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";
+            case Metamodel.BuiltinType bt -> switch (bt) {
+                case INT, LONG -> "int";
+                case STRING -> "str";
+                case BOOL -> "bool";
+                case DOUBLE -> "float";
+            };
+            default -> t.name();
         };
 
     }

From d1bef25a5a7e5b9f530ed61e57708d8d1250dcb7 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 28 Nov 2025 03:00:00 +0100
Subject: [PATCH 46/50] fixing the missing javadoc in the api generator

---
 api.meta.json                                 | 1265 -----------------
 api.meta.md                                   |  473 ------
 keyext.api.doc/build.gradle                   |    2 +-
 .../org/key_project/key/api/doc/DocGen.java   |   43 +-
 .../key/api/doc/ExtractMetaData.java          |  259 ++--
 .../org/key_project/key/api/doc/Main.java     |    8 +-
 .../key_project/key/api/doc/Metamodel.java    |   34 +-
 .../key/api/doc/PythonGenerator.java          |   18 +-
 keyext.api/build.gradle                       |    4 +
 .../org/keyproject/key/api/KeyApiImpl.java    |    6 +-
 .../keyproject/key/api/data/ContractDesc.java |   10 +-
 .../api/{remoteapi => data}/ExampleDesc.java  |    2 +-
 .../keyproject/key/api/data/FunctionDesc.java |    3 +-
 .../key/api/data/KeYDataTransferObject.java   |    2 +
 .../key/api/data/KeyIdentifications.java      |    1 -
 .../keyproject/key/api/data/LoadParams.java   |    6 +-
 .../key/api/{internal => data}/NodeText.java  |    2 +-
 .../key/api/data/PredicateDesc.java           |    4 +-
 .../api/{remoteapi => data}/PrintOptions.java |    2 +-
 .../key/api/data/ProofScriptCommandDesc.java  |    2 +-
 .../keyproject/key/api/data/TextRange.java    |   10 +
 .../key/api/remoteapi/ExampleApi.java         |    1 +
 .../api/remoteclient/ShowDocumentParams.java  |   47 +-
 .../formal/keyextclientjava/MyKeyClient.java  |    2 +-
 24 files changed, 296 insertions(+), 1910 deletions(-)
 delete mode 100644 api.meta.json
 delete mode 100644 api.meta.md
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/ExampleDesc.java (91%)
 rename keyext.api/src/main/java/org/keyproject/key/api/{internal => data}/NodeText.java (89%)
 rename keyext.api/src/main/java/org/keyproject/key/api/{remoteapi => data}/PrintOptions.java (89%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java

diff --git a/api.meta.json b/api.meta.json
deleted file mode 100644
index 953b76c6088..00000000000
--- a/api.meta.json
+++ /dev/null
@@ -1,1265 +0,0 @@
-{
-  "endpoints": [
-    {
-      "name": "examples/list",
-      "documentation": "",
-      "args": [],
-      "returnType": {
-        "type": {
-          "typeName": "ExampleDesc",
-          "fields": [
-            {
-              "name": "name",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "description",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "meta/version",
-      "documentation": "",
-      "args": [],
-      "returnType": "STRING"
-    },
-    {
-      "name": "meta/available_script_commands",
-      "documentation": "",
-      "args": [],
-      "returnType": {
-        "type": {
-          "typeName": "ProofScriptCommandDesc",
-          "fields": [],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "meta/available_macros",
-      "documentation": "",
-      "args": [],
-      "returnType": {
-        "type": {
-          "typeName": "ProofMacroDesc",
-          "fields": [
-            {
-              "name": "name",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "category",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "description",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "scriptCommandName",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "server/exit",
-      "documentation": "",
-      "args": []
-    },
-    {
-      "name": "server/shutdown",
-      "documentation": "",
-      "args": [],
-      "returnType": "BOOL"
-    },
-    {
-      "name": "server/setTrace",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "SetTraceParams"
-        }
-      ]
-    },
-    {
-      "name": "proofTree/root",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "ProofId"
-        }
-      ],
-      "returnType": {
-        "typeName": "TreeNodeDesc",
-        "fields": [],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "proofTree/children",
-      "documentation": "",
-      "args": [
-        {
-          "name": "proof",
-          "type": "ProofId"
-        },
-        {
-          "name": "nodeId",
-          "type": "TreeNodeId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "TreeNodeDesc",
-          "fields": [],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "proofTree/subtree",
-      "documentation": "",
-      "args": [
-        {
-          "name": "proof",
-          "type": "ProofId"
-        },
-        {
-          "name": "nodeId",
-          "type": "TreeNodeId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "TreeNodeDesc",
-          "fields": [],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "goal/print",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "NodeId"
-        },
-        {
-          "name": "options",
-          "type": "PrintOptions"
-        }
-      ],
-      "returnType": {
-        "typeName": "NodeTextDesc",
-        "fields": [
-          {
-            "name": "id",
-            "type": "NodeTextId",
-            "documentation": ""
-          },
-          {
-            "name": "result",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "goal/actions",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "NodeTextId"
-        },
-        {
-          "name": "pos",
-          "type": "INT"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "TermActionDesc",
-          "fields": [
-            {
-              "name": "commandId",
-              "type": "TermActionId",
-              "documentation": ""
-            },
-            {
-              "name": "displayName",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "description",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "category",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "kind",
-              "type": "TermActionKind",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "goal/apply_action",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "TermActionId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "TermActionDesc",
-          "fields": [
-            {
-              "name": "commandId",
-              "type": "TermActionId",
-              "documentation": ""
-            },
-            {
-              "name": "displayName",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "description",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "category",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "kind",
-              "type": "TermActionKind",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "goal/free",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "NodeTextId"
-        }
-      ]
-    },
-    {
-      "name": "env/functions",
-      "documentation": "",
-      "args": [
-        {
-          "name": "env",
-          "type": "EnvironmentId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "FunctionDesc",
-          "fields": [
-            {
-              "name": "name",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "sort",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "retSort",
-              "type": "SortDesc",
-              "documentation": ""
-            },
-            {
-              "name": "argSorts",
-              "type": "List",
-              "documentation": ""
-            },
-            {
-              "name": "rigid",
-              "type": "BOOL",
-              "documentation": ""
-            },
-            {
-              "name": "unique",
-              "type": "BOOL",
-              "documentation": ""
-            },
-            {
-              "name": "skolemConstant",
-              "type": "BOOL",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "env/sorts",
-      "documentation": "",
-      "args": [
-        {
-          "name": "env",
-          "type": "EnvironmentId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "SortDesc",
-          "fields": [
-            {
-              "name": "string",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "documentation",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "extendsSorts",
-              "type": "List",
-              "documentation": ""
-            },
-            {
-              "name": "anAbstract",
-              "type": "BOOL",
-              "documentation": ""
-            },
-            {
-              "name": "s",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "env/contracts",
-      "documentation": "",
-      "args": [
-        {
-          "name": "env",
-          "type": "EnvironmentId"
-        }
-      ],
-      "returnType": {
-        "type": {
-          "typeName": "ContractDesc",
-          "fields": [
-            {
-              "name": "contractId",
-              "type": "ContractId",
-              "documentation": ""
-            },
-            {
-              "name": "name",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "displayName",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "typeName",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "htmlText",
-              "type": "STRING",
-              "documentation": ""
-            },
-            {
-              "name": "plainText",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "env/openContract",
-      "documentation": "",
-      "args": [
-        {
-          "name": "contractId",
-          "type": "ContractId"
-        }
-      ],
-      "returnType": {
-        "typeName": "ProofId",
-        "fields": [
-          {
-            "name": "env",
-            "type": "EnvironmentId",
-            "documentation": ""
-          },
-          {
-            "name": "proofId",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "loading/load",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "LoadParams"
-        }
-      ],
-      "returnType": {
-        "a": {
-          "typeName": "EnvironmentId",
-          "fields": [
-            {
-              "name": "envId",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "b": {
-          "typeName": "ProofId",
-          "fields": [
-            {
-              "name": "env",
-              "type": "EnvironmentId",
-              "documentation": ""
-            },
-            {
-              "name": "proofId",
-              "type": "STRING",
-              "documentation": ""
-            }
-          ],
-          "documentation": ""
-        },
-        "documentation": ""
-      }
-    },
-    {
-      "name": "loading/loadExample",
-      "documentation": "",
-      "args": [
-        {
-          "name": "id",
-          "type": "STRING"
-        }
-      ],
-      "returnType": {
-        "typeName": "ProofId",
-        "fields": [
-          {
-            "name": "env",
-            "type": "EnvironmentId",
-            "documentation": ""
-          },
-          {
-            "name": "proofId",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "loading/loadProblem",
-      "documentation": "",
-      "args": [
-        {
-          "name": "problem",
-          "type": "ProblemDefinition"
-        }
-      ],
-      "returnType": {
-        "typeName": "ProofId",
-        "fields": [
-          {
-            "name": "env",
-            "type": "EnvironmentId",
-            "documentation": ""
-          },
-          {
-            "name": "proofId",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "loading/loadKey",
-      "documentation": "",
-      "args": [
-        {
-          "name": "content",
-          "type": "STRING"
-        }
-      ],
-      "returnType": {
-        "typeName": "ProofId",
-        "fields": [
-          {
-            "name": "env",
-            "type": "EnvironmentId",
-            "documentation": ""
-          },
-          {
-            "name": "proofId",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "loading/loadTerm",
-      "documentation": "",
-      "args": [
-        {
-          "name": "term",
-          "type": "STRING"
-        }
-      ],
-      "returnType": {
-        "typeName": "ProofId",
-        "fields": [
-          {
-            "name": "env",
-            "type": "EnvironmentId",
-            "documentation": ""
-          },
-          {
-            "name": "proofId",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "client/sayHello",
-      "documentation": "",
-      "args": [
-        {
-          "name": "e",
-          "type": "STRING"
-        }
-      ]
-    },
-    {
-      "name": "client/logTrace",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "LogTraceParams"
-        }
-      ]
-    },
-    {
-      "name": "client/sm",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "ShowMessageParams"
-        }
-      ]
-    },
-    {
-      "name": "client/userResponse",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "ShowMessageRequestParams"
-        }
-      ],
-      "returnType": {
-        "typeName": "MessageActionItem",
-        "fields": [
-          {
-            "name": "title",
-            "type": "STRING",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    },
-    {
-      "name": "client/showDocument",
-      "documentation": "",
-      "args": [
-        {
-          "name": "params",
-          "type": "ShowDocumentParams"
-        }
-      ],
-      "returnType": {
-        "typeName": "ShowDocumentResult",
-        "fields": [
-          {
-            "name": "success",
-            "type": "BOOL",
-            "documentation": ""
-          }
-        ],
-        "documentation": ""
-      }
-    }
-  ],
-  "types": [
-    {
-      "typeName": "ExampleDesc",
-      "fields": [
-        {
-          "name": "name",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "description",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ProofScriptCommandDesc",
-      "fields": [],
-      "documentation": ""
-    },
-    {
-      "typeName": "ProofMacroDesc",
-      "fields": [
-        {
-          "name": "name",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "category",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "description",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "scriptCommandName",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TraceValue",
-      "values": [
-        "Off",
-        "Message",
-        "All"
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "SetTraceParams",
-      "fields": [
-        {
-          "name": "value",
-          "type": "TraceValue",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "EnvironmentId",
-      "fields": [
-        {
-          "name": "envId",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ProofId",
-      "fields": [
-        {
-          "name": "env",
-          "type": "EnvironmentId",
-          "documentation": ""
-        },
-        {
-          "name": "proofId",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TreeNodeDesc",
-      "fields": [],
-      "documentation": ""
-    },
-    {
-      "typeName": "TreeNodeId",
-      "fields": [
-        {
-          "name": "id",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "NodeId",
-      "fields": [
-        {
-          "name": "proofId",
-          "type": "ProofId",
-          "documentation": ""
-        },
-        {
-          "name": "nodeId",
-          "type": "INT",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "PrintOptions",
-      "fields": [
-        {
-          "name": "unicode",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "width",
-          "type": "INT",
-          "documentation": ""
-        },
-        {
-          "name": "indentation",
-          "type": "INT",
-          "documentation": ""
-        },
-        {
-          "name": "pure",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "termLabels",
-          "type": "BOOL",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "NodeTextId",
-      "fields": [
-        {
-          "name": "nodeId",
-          "type": "NodeId",
-          "documentation": ""
-        },
-        {
-          "name": "nodeTextId",
-          "type": "INT",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "NodeTextDesc",
-      "fields": [
-        {
-          "name": "id",
-          "type": "NodeTextId",
-          "documentation": ""
-        },
-        {
-          "name": "result",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TermActionId",
-      "fields": [
-        {
-          "name": "nodeId",
-          "type": "NodeId",
-          "documentation": ""
-        },
-        {
-          "name": "pio",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "id",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TermActionKind",
-      "values": [
-        "BuiltIn",
-        "Script",
-        "Macro",
-        "Taclet"
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TermActionDesc",
-      "fields": [
-        {
-          "name": "commandId",
-          "type": "TermActionId",
-          "documentation": ""
-        },
-        {
-          "name": "displayName",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "description",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "category",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "kind",
-          "type": "TermActionKind",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "List",
-      "fields": [],
-      "documentation": ""
-    },
-    {
-      "typeName": "SortDesc",
-      "fields": [
-        {
-          "name": "string",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "documentation",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "extendsSorts",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "anAbstract",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "s",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "FunctionDesc",
-      "fields": [
-        {
-          "name": "name",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "sort",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "retSort",
-          "type": "SortDesc",
-          "documentation": ""
-        },
-        {
-          "name": "argSorts",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "rigid",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "unique",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "skolemConstant",
-          "type": "BOOL",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ContractId",
-      "fields": [
-        {
-          "name": "envId",
-          "type": "EnvironmentId",
-          "documentation": ""
-        },
-        {
-          "name": "contractId",
-          "type": "INT",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ContractDesc",
-      "fields": [
-        {
-          "name": "contractId",
-          "type": "ContractId",
-          "documentation": ""
-        },
-        {
-          "name": "name",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "displayName",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "typeName",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "htmlText",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "plainText",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "LoadParams",
-      "fields": [
-        {
-          "name": "keyFile",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "javaFile",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "classPath",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "bootClassPath",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "includes",
-          "type": "List",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ProblemDefinition",
-      "fields": [
-        {
-          "name": "sorts",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "functions",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "predicates",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "antecTerms",
-          "type": "List",
-          "documentation": ""
-        },
-        {
-          "name": "succTerms",
-          "type": "List",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "LogTraceParams",
-      "fields": [
-        {
-          "name": "messag",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "verbose",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "MessageType",
-      "values": [
-        "Unused",
-        "Error",
-        "Warning",
-        "Info",
-        "Log",
-        "Debug"
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ShowMessageParams",
-      "fields": [
-        {
-          "name": "type",
-          "type": "MessageType",
-          "documentation": ""
-        },
-        {
-          "name": "message",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ShowMessageRequestParams",
-      "fields": [
-        {
-          "name": "type",
-          "type": "MessageType",
-          "documentation": ""
-        },
-        {
-          "name": "message",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "actions",
-          "type": "List",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "MessageActionItem",
-      "fields": [
-        {
-          "name": "title",
-          "type": "STRING",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "Range",
-      "fields": [
-        {
-          "name": "start",
-          "type": "INT",
-          "documentation": ""
-        },
-        {
-          "name": "end",
-          "type": "INT",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ShowDocumentParams",
-      "fields": [
-        {
-          "name": "uri",
-          "type": "STRING",
-          "documentation": ""
-        },
-        {
-          "name": "external",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "takeFocus",
-          "type": "BOOL",
-          "documentation": ""
-        },
-        {
-          "name": "selection",
-          "type": "Range",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "ShowDocumentResult",
-      "fields": [
-        {
-          "name": "success",
-          "type": "BOOL",
-          "documentation": ""
-        }
-      ],
-      "documentation": ""
-    },
-    {
-      "typeName": "TaskFinishedInfo",
-      "fields": [],
-      "documentation": ""
-    },
-    {
-      "typeName": "TaskStartedInfo",
-      "fields": [],
-      "documentation": ""
-    }
-  ]
-}
\ No newline at end of file
diff --git a/api.meta.md b/api.meta.md
deleted file mode 100644
index f6d7a29c764..00000000000
--- a/api.meta.md
+++ /dev/null
@@ -1,473 +0,0 @@
-## Types
-### Type: ContractDesc
-```
-type ContractDesc {
- 	contractId : ContractId
-	displayName : STRING
-	htmlText : STRING
-	name : STRING
-	plainText : STRING
-	typeName : STRING
-}
-```
-
-### Type: ContractId
-```
-type ContractId {
- 	contractId : INT
-	envId : EnvironmentId
-}
-```
-
-### Type: EnvironmentId
-```
-type EnvironmentId {
- 	envId : STRING
-}
-```
-
-### Type: ExampleDesc
-```
-type ExampleDesc {
- 	description : STRING
-	name : STRING
-}
-```
-
-### Type: FunctionDesc
-```
-type FunctionDesc {
- 	argSorts : List
-	name : STRING
-	retSort : SortDesc
-	rigid : BOOL
-	skolemConstant : BOOL
-	sort : STRING
-	unique : BOOL
-}
-```
-
-### Type: List
-```
-type List {
- 
-}
-```
-
-### Type: LoadParams
-```
-type LoadParams {
- 	bootClassPath : STRING
-	classPath : List
-	includes : List
-	javaFile : STRING
-	keyFile : STRING
-}
-```
-
-### Type: LogTraceParams
-```
-type LogTraceParams {
- 	messag : STRING
-	verbose : STRING
-}
-```
-
-### Type: MessageActionItem
-```
-type MessageActionItem {
- 	title : STRING
-}
-```
-
-### Type: MessageType
-```
-enum MessageType { Unused, Error, Warning, Info, Log, Debug }
-```
-
-### Type: NodeId
-```
-type NodeId {
- 	nodeId : INT
-	proofId : ProofId
-}
-```
-
-### Type: NodeTextDesc
-```
-type NodeTextDesc {
- 	id : NodeTextId
-	result : STRING
-}
-```
-
-### Type: NodeTextId
-```
-type NodeTextId {
- 	nodeId : NodeId
-	nodeTextId : INT
-}
-```
-
-### Type: PrintOptions
-```
-type PrintOptions {
- 	indentation : INT
-	pure : BOOL
-	termLabels : BOOL
-	unicode : BOOL
-	width : INT
-}
-```
-
-### Type: ProblemDefinition
-```
-type ProblemDefinition {
- 	antecTerms : List
-	functions : List
-	predicates : List
-	sorts : List
-	succTerms : List
-}
-```
-
-### Type: ProofId
-```
-type ProofId {
- 	env : EnvironmentId
-	proofId : STRING
-}
-```
-
-### Type: ProofMacroDesc
-```
-type ProofMacroDesc {
- 	category : STRING
-	description : STRING
-	name : STRING
-	scriptCommandName : STRING
-}
-```
-
-### Type: ProofScriptCommandDesc
-```
-type ProofScriptCommandDesc {
- 
-}
-```
-
-### Type: Range
-```
-type Range {
- 	end : INT
-	start : INT
-}
-```
-
-### Type: SetTraceParams
-```
-type SetTraceParams {
- 	value : TraceValue
-}
-```
-
-### Type: ShowDocumentParams
-```
-type ShowDocumentParams {
- 	external : BOOL
-	selection : Range
-	takeFocus : BOOL
-	uri : STRING
-}
-```
-
-### Type: ShowDocumentResult
-```
-type ShowDocumentResult {
- 	success : BOOL
-}
-```
-
-### Type: ShowMessageParams
-```
-type ShowMessageParams {
- 	message : STRING
-	type : MessageType
-}
-```
-
-### Type: ShowMessageRequestParams
-```
-type ShowMessageRequestParams {
- 	actions : List
-	message : STRING
-	type : MessageType
-}
-```
-
-### Type: SortDesc
-```
-type SortDesc {
- 	anAbstract : BOOL
-	documentation : STRING
-	extendsSorts : List
-	s : STRING
-	string : STRING
-}
-```
-
-### Type: TaskFinishedInfo
-```
-type TaskFinishedInfo {
- 
-}
-```
-
-### Type: TaskStartedInfo
-```
-type TaskStartedInfo {
- 
-}
-```
-
-### Type: TermActionDesc
-```
-type TermActionDesc {
- 	category : STRING
-	commandId : TermActionId
-	description : STRING
-	displayName : STRING
-	kind : TermActionKind
-}
-```
-
-### Type: TermActionId
-```
-type TermActionId {
- 	id : STRING
-	nodeId : NodeId
-	pio : STRING
-}
-```
-
-### Type: TermActionKind
-```
-enum TermActionKind { BuiltIn, Script, Macro, Taclet }
-```
-
-### Type: TraceValue
-```
-enum TraceValue { Off, Message, All }
-```
-
-### Type: TreeNodeDesc
-```
-type TreeNodeDesc {
- 
-}
-```
-
-### Type: TreeNodeId
-```
-type TreeNodeId {
- 	id : STRING
-}
-```
-
-## Endpoints
-### client/logTrace (`server ~~> client`) 
-
-```
-Client.client/logTrace( params : LogTraceParams ) **async**
-```
-
-
-### client/sayHello (`server ~~> client`) 
-
-```
-Client.client/sayHello( e : STRING ) **async**
-```
-
-
-### client/showDocument (`server -> client`) 
-
-```
-Client.client/showDocument( params : ShowDocumentParams ) -> ShowDocumentResult
-```
-
-
-### client/sm (`server ~~> client`) 
-
-```
-Client.client/sm( params : ShowMessageParams ) **async**
-```
-
-
-### client/userResponse (`server -> client`) 
-
-```
-Client.client/userResponse( params : ShowMessageRequestParams ) -> MessageActionItem
-```
-
-
-### env/contracts (`client -> server`) 
-
-```
-Server.env/contracts( env : EnvironmentId ) -> ContractDesc[]
-```
-
-
-### env/functions (`client -> server`) 
-
-```
-Server.env/functions( env : EnvironmentId ) -> FunctionDesc[]
-```
-
-
-### env/openContract (`client -> server`) 
-
-```
-Server.env/openContract( contractId : ContractId ) -> ProofId
-```
-
-
-### env/sorts (`client -> server`) 
-
-```
-Server.env/sorts( env : EnvironmentId ) -> SortDesc[]
-```
-
-
-### examples/list (`client -> server`) 
-
-```
-Server.examples/list(  ) -> ExampleDesc[]
-```
-
-
-### goal/actions (`client -> server`) 
-
-```
-Server.goal/actions( id : NodeTextId, pos : INT ) -> TermActionDesc[]
-```
-
-
-### goal/apply_action (`client -> server`) 
-
-```
-Server.goal/apply_action( id : TermActionId ) -> TermActionDesc[]
-```
-
-
-### goal/free (`client ~~> server`) 
-
-```
-Server.goal/free( id : NodeTextId ) **async**
-```
-
-
-### goal/print (`client -> server`) 
-
-```
-Server.goal/print( id : NodeId, options : PrintOptions ) -> NodeTextDesc
-```
-
-
-### loading/load (`client -> server`) 
-
-```
-Server.loading/load( params : LoadParams ) -> either<a,b>
-```
-
-
-### loading/loadExample (`client -> server`) 
-
-```
-Server.loading/loadExample( id : STRING ) -> ProofId
-```
-
-
-### loading/loadKey (`client -> server`) 
-
-```
-Server.loading/loadKey( content : STRING ) -> ProofId
-```
-
-
-### loading/loadProblem (`client -> server`) 
-
-```
-Server.loading/loadProblem( problem : ProblemDefinition ) -> ProofId
-```
-
-
-### loading/loadTerm (`client -> server`) 
-
-```
-Server.loading/loadTerm( term : STRING ) -> ProofId
-```
-
-
-### meta/available_macros (`client -> server`) 
-
-```
-Server.meta/available_macros(  ) -> ProofMacroDesc[]
-```
-
-
-### meta/available_script_commands (`client -> server`) 
-
-```
-Server.meta/available_script_commands(  ) -> ProofScriptCommandDesc[]
-```
-
-
-### meta/version (`client -> server`) 
-
-```
-Server.meta/version(  ) -> STRING
-```
-
-
-### proofTree/children (`client -> server`) 
-
-```
-Server.proofTree/children( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
-```
-
-
-### proofTree/root (`client -> server`) 
-
-```
-Server.proofTree/root( id : ProofId ) -> TreeNodeDesc
-```
-
-
-### proofTree/subtree (`client -> server`) 
-
-```
-Server.proofTree/subtree( proof : ProofId, nodeId : TreeNodeId ) -> TreeNodeDesc[]
-```
-
-
-### server/exit (`client ~~> server`) 
-
-```
-Server.server/exit(  ) **async**
-```
-
-
-### server/setTrace (`client ~~> server`) 
-
-```
-Server.server/setTrace( params : SetTraceParams ) **async**
-```
-
-
-### server/shutdown (`client -> server`) 
-
-```
-Server.server/shutdown(  ) -> BOOL
-```
-
-
diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index c3778ab3e7c..b1c0c645a85 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(project(":keyext.api"))
-    implementation("com.github.javaparser:javaparser-symbol-solver-core:3.26.1")
+    //implementation("com.github.javaparser:javaparser-symbol-solver-core:3.26.1")
     implementation("info.picocli:picocli:4.7.6")
 }
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index bab724c68b3..191008efd1d 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -2,11 +2,11 @@
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.key.api.doc;/*
-                                     * This file is part of KeY - https://key-project.org
-                                     * KeY is licensed under the GNU General Public License Version
-                                     * 2
-                                     * SPDX-License-Identifier: GPL-2.0-only
-                                     */
+ * This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version
+ * 2
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -34,7 +34,7 @@ public String get() {
             printHeader();
 
             out.format("## Types%n");
-            metamodel.types()
+            metamodel.types().values()
                     .stream().sorted(Comparator.comparing(Metamodel.Type::name))
                     .forEach(this::printType);
 
@@ -72,13 +72,11 @@ private void endpoints(Metamodel.Endpoint endpoint) {
                 .collect(Collectors.joining(", "));
         switch (endpoint) {
             case Metamodel.ServerRequest sr ->
-                out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+                    out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
             case Metamodel.ClientRequest sr ->
-                out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ServerNotification ignored ->
-                out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-            case Metamodel.ClientNotification ignored ->
-                out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
+                    out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
+            case Metamodel.ServerNotification ignored -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
+            case Metamodel.ClientNotification ignored -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
             default -> {
             }
         }
@@ -92,24 +90,31 @@ private void printType(Metamodel.Type type) {
         out.format("### Type: %s%n", type.name());
         if (type instanceof Metamodel.ObjectType ot) {
             out.format("""
-                    ```
+                    %s 
+                    ```                    
                     type %s {
                      %s
                     }
                     ```
-                    """.formatted(type.name(),
-                ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
-                        .collect(Collectors.joining("\n"))));
+                    """.formatted(
+                    type.documentation(),
+                    type.name(),
+                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
+                            .map(it -> "  /* %s */\n  %s : %s".formatted(it.documentation(), it.name(), it.type()))
+                            .collect(Collectors.joining("\n"))));
         }
 
         if (type instanceof Metamodel.EnumType et) {
             out.format("""
                     ```
+                    %s
                     enum %s { %s }
                     ```
-                    """.formatted(type.name(), String.join(", ", et.values())));
-            out.format(type.documentation());
+                    """.formatted(
+                    type.documentation(),
+                    type.name(),
+                    et.values().stream().map(it -> "  /* %s */\n  %s".formatted(it.documentation(), it.value())).collect(Collectors.joining("\n"))));
+                    out.format(type.documentation());
         }
         out.format(type.documentation());
         out.println();
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 2f33337d6b2..3d6f61c866d 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -2,28 +2,17 @@
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.key.api.doc;/*
-                                     * This file is part of KeY - https://key-project.org
-                                     * KeY is licensed under the GNU General Public License Version
-                                     * 2
-                                     * SPDX-License-Identifier: GPL-2.0-only
-                                     */
-
-import java.io.File;
-import java.lang.reflect.*;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
+ * This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version
+ * 2
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
 
+import com.github.therapi.runtimejavadoc.ClassJavadoc;
+import com.github.therapi.runtimejavadoc.FieldJavadoc;
+import com.github.therapi.runtimejavadoc.MethodJavadoc;
+import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
 import de.uka.ilkd.key.proof.Proof;
-
-import com.github.javaparser.ParseProblemException;
-import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.ast.body.TypeDeclaration;
-import com.github.javaparser.ast.comments.Comment;
-import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
-import com.github.javaparser.javadoc.Javadoc;
-import com.github.javaparser.javadoc.description.JavadocDescription;
-import com.github.javaparser.utils.SourceRoot;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
@@ -32,6 +21,11 @@
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
+import java.io.File;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
@@ -39,20 +33,10 @@
 
 public class ExtractMetaData implements Runnable {
     private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
-    private final List<Metamodel.Type> types = new LinkedList<>();
+    private final Map<Class<?>, Metamodel.Type> types = new HashMap<>();
     private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
-    private final SourceRoot sourceRoot;
-
-    public ExtractMetaData(Path source) {
-        ParserConfiguration config = new ParserConfiguration();
-        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21);
-        config.setAttributeComments(true);
-        config.setLexicalPreservationEnabled(false);
-        config.setStoreTokens(false);
-        config.setIgnoreAnnotationsWhenAttributingComments(true);
-        config.setDoNotAssignCommentsPrecedingEmptyLines(true);
-        sourceRoot = new SourceRoot(source, config);
-    }
+
+    public ExtractMetaData() {}
 
     @Override
     public void run() {
@@ -101,17 +85,22 @@ private void addServerEndpoint(Method method) {
         }
 
         throw new IllegalStateException(
-            "Method " + method + " is neither a request nor a notification");
+                "Method " + method + " is neither a request nor a notification");
     }
 
     private String findDocumentation(Method method) {
-        return findCompilationUnit(method.getDeclaringClass())
+        MethodJavadoc javadoc = RuntimeJavadoc.getJavadoc(method);
+        return javadoc.getParams().toString() +
+                javadoc.getThrows() +
+                javadoc.getReturns().toString();
+
+        /*return findCompilationUnit(method.getDeclaringClass())
                 .map(it -> it.getMethodsByName(method.getName()))
                 .map(List::getFirst)
                 .flatMap(NodeWithJavadoc::getJavadoc)
                 .map(Javadoc::getDescription)
                 .map(JavadocDescription::toText)
-                .orElse("");
+                .orElse("");*/
     }
 
     private List<Metamodel.Argument> translate(Parameter[] parameters) {
@@ -124,21 +113,6 @@ private Metamodel.Argument translate(Parameter parameter) {
     }
 
     private Metamodel.Type getOrFindType(Class<?> type) {
-        System.out.println(type);
-        if (type == CompletableFuture.class) {
-            return getOrFindType(type.getTypeParameters()[0].getClass());
-        }
-
-        if (type == List.class) {
-            // TODO try to get the type below.
-            var subType = getOrFindType(type.getTypeParameters()[0].getClass());
-            return new Metamodel.ListType(subType, "");
-        }
-
-        if (type == Class.class || type == Constructor.class || type == Proof.class) {
-            throw new IllegalStateException("Forbidden class reached!");
-        }
-
         if (type == String.class)
             return Metamodel.BuiltinType.STRING;
         if (type == Integer.class)
@@ -165,47 +139,82 @@ private Metamodel.Type getOrFindType(Class<?> type) {
         if (type == Character.TYPE)
             return Metamodel.BuiltinType.LONG;
 
-        var t = types.stream().filter(it -> it.name().equals(type.getSimpleName())).findFirst();
-        if (t.isPresent())
-            return t.get();
+        if (type == CompletableFuture.class) {
+            return getOrFindType(type.getTypeParameters()[0].getClass());
+        }
+
+
+        if (type == List.class) {
+            // TODO try to get the type below.
+            var subType = getOrFindType(type.getTypeParameters()[0]);
+            return new Metamodel.ListType(subType, "");
+        }
+
+        if (type == Class.class || type == Constructor.class || type == Proof.class) {
+            throw new IllegalStateException("Forbidden class reached!");
+        }
+
+
+        var t = types.get(type);
+        if (t != null) return t;
         var a = createType(type);
-        types.add(a);
+        types.put(type, a);
         return a;
     }
 
     private Metamodel.Type createType(Class<?> type) {
+
         final var documentation = findDocumentation(type);
         if (type.isEnum())
             return new Metamodel.EnumType(type.getSimpleName(), type.getName(),
-                Arrays.stream(type.getEnumConstants()).map(Object::toString).toList(),
-                documentation);
+                    Arrays.stream(type.getEnumConstants())
+                            .map(
+                                    it ->
+                                            new Metamodel.EnumConstant(it.toString(),
+                                                    findDocumentation(type, it)))
+                            .toList(),
+                    documentation);
 
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(),
-            documentation);
+                documentation);
         final var list = Arrays.stream(type.getDeclaredFields())
-                .map(it -> new Metamodel.Field(it.getName(), getOrFindType(it.getType()).name()))
+                .map(it -> new Metamodel.Field(it.getName(), getOrFindTypeName(it.getGenericType()),
+                        findDocumentation(it)
+                        ))
                 .toList();
         obj.fields().addAll(list);
         return obj;
     }
 
-    private String findDocumentation(Class<?> type) {
-        return findCompilationUnit(type)
-                .flatMap(NodeWithJavadoc::getJavadocComment)
-                .map(Comment::getContent)
-                .orElse("");
+    private String findDocumentation(Field it) {
+        var javadoc = RuntimeJavadoc.getJavadoc(it);
+        return printFieldDocumentation(javadoc);
     }
 
-    private Optional<TypeDeclaration<?>> findCompilationUnit(Class<?> type) {
-        try {
-            return sourceRoot.parse(type.getPackageName(), type.getSimpleName() + ".java")
-                    .getPrimaryType();
-        } catch (ParseProblemException e) {
-            return Optional.empty();
+    private @Nullable String findDocumentation(Class<?> type, Object enumConstant) {
+        ClassJavadoc javadoc = RuntimeJavadoc.getJavadoc(type);
+        for (var cdoc : javadoc.getEnumConstants()) {
+            if (cdoc.getName().equalsIgnoreCase(enumConstant.toString())) {
+                return printFieldDocumentation(cdoc);
+            }
         }
+        return null;
+    }
+
+    private static String printFieldDocumentation(FieldJavadoc cdoc) {
+        return cdoc.getComment().toString() +
+                (cdoc.getOther().isEmpty() ? "" : cdoc.getOther().toString()) +
+                (cdoc.getSeeAlso().isEmpty() ? "" : cdoc.getSeeAlso().toString());
     }
 
+    private String findDocumentation(Class<?> type) {
+        ClassJavadoc classDoc = RuntimeJavadoc.getJavadoc(type);
+        if (!classDoc.isEmpty()) { // optionally skip absent documentation
+            return classDoc.getComment().toString() + classDoc.getOther() + classDoc.getSeeAlso();
+        }
+        return "";
+    }
 
     private void addClientEndpoint(Method method) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
@@ -235,7 +244,7 @@ private void addClientEndpoint(Method method) {
     }
 
     private static String callMethodName(String method, String segment, @Nullable String userValue,
-            boolean useSegment) {
+                                         boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -251,25 +260,105 @@ private static String callMethodName(String method, String segment, @Nullable St
         }
     }
 
-    private Metamodel.@Nullable Type getOrFindType(Type genericReturnType) {
-        if (genericReturnType instanceof Class<?> c)
-            return getOrFindType(c);
-        if (genericReturnType instanceof ParameterizedType pt) {
-            if (Objects.equals(pt.getRawType().getTypeName(),
-                CompletableFuture.class.getTypeName())) {
-                return getOrFindType(pt.getActualTypeArguments()[0]);
+
+    private String getOrFindTypeName(Type type) {
+        switch (type) {
+            case GenericArrayType a -> throw new RuntimeException("Unwanted type found: " + type);
+            case Class<?> c -> {
+                return getOrFindTypeName(c);
+            }
+            case ParameterizedType pt -> {
+                if (Objects.equals(pt.getRawType().getTypeName(),
+                        CompletableFuture.class.getTypeName())) {
+                    return getOrFindTypeName(pt.getActualTypeArguments()[0]);
+                }
+                if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
+                    String base = getOrFindTypeName(pt.getActualTypeArguments()[0]);
+                    return base + "[]";
+                }
+
+                if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
+                    var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
+                    var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
+                    return "either<" + base1 + ", " + base2 + ">";
+                }
             }
-            if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
-                var base = getOrFindType(pt.getActualTypeArguments()[0]);
-                return new Metamodel.ListType(base, "");
+            default -> {
             }
+        }
+
+        return "<error>!!!";
+    }
 
-            if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
-                var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
-                var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
-                return new Metamodel.EitherType(base1, base2, "");
+    private String getOrFindTypeName(Class<?> type) {
+        var t = types.get(type);
+
+        if (t != null) return t.name();
+        else if (type == String.class)
+            return Metamodel.BuiltinType.STRING.name();
+        else if (type == Integer.class)
+            return Metamodel.BuiltinType.INT.name();
+        else if (type == Double.class)
+            return Metamodel.BuiltinType.DOUBLE.name();
+        else if (type == Long.class)
+            return Metamodel.BuiltinType.LONG.name();
+        else if (type == Character.class)
+            return Metamodel.BuiltinType.LONG.name();
+        else if (type == File.class)
+            return Metamodel.BuiltinType.STRING.name();
+        else if (type == Boolean.class)
+            return Metamodel.BuiltinType.BOOL.name();
+        else if (type == Boolean.TYPE)
+            return Metamodel.BuiltinType.BOOL.name();
+        else if (type == Integer.TYPE)
+            return Metamodel.BuiltinType.INT.name();
+        else if (type == Double.TYPE)
+            return Metamodel.BuiltinType.DOUBLE.name();
+        else if (type == Long.TYPE)
+            return Metamodel.BuiltinType.LONG.name();
+        else if (type == Character.TYPE)
+            return Metamodel.BuiltinType.LONG.name();
+        else if (type == CompletableFuture.class) {
+            return getOrFindTypeName(type.getTypeParameters()[0].getClass());
+        } else if (type == List.class) {
+            var subType = getOrFindTypeName(type.getTypeParameters()[0]);
+            return subType + "[]";
+        } else if (type == Class.class || type == Constructor.class || type == Proof.class) {
+            throw new IllegalStateException("Forbidden class reached!");
+        } else if (type instanceof Class<?>) {
+            return type.getSimpleName();
+        }
+        return "<error>!!!??!?!?";
+    }
+
+
+    private Metamodel.@Nullable Type getOrFindType(Type genericReturnType) {
+        switch (genericReturnType) {
+            case GenericArrayType a ->
+                    throw new RuntimeException("Unwanted type found: " + genericReturnType);
+            case Class<?> c -> {
+                return getOrFindType(c);
+            }
+            case ParameterizedType pt -> {
+                if (Objects.equals(pt.getRawType().getTypeName(),
+                        CompletableFuture.class.getTypeName())) {
+                    return getOrFindType(pt.getActualTypeArguments()[0]);
+                }
+                if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
+                    var base = getOrFindType(pt.getActualTypeArguments()[0]);
+                    return new Metamodel.ListType(base, "");
+                }
+
+                if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
+                    var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
+                    var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
+                    return new Metamodel.EitherType(base1, base2, "");
+                }
+            }
+            case null, default -> {
             }
         }
+
         return null;
     }
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
index e601e2882c7..80ce14543b3 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
@@ -31,9 +31,9 @@
     version = "gendoc 1.0",
     description = "Generates the documentation for key.api")
 public class Main implements Callable<Integer> {
-    @CommandLine.Option(names = { "-s", "--source" },
-        description = "Source folder for getting JavaDoc")
-    private @Nullable Path source = Paths.get("..", "keyext.api", "src", "main", "java");
+    @CommandLine.Option(names = {"-s", "--source"},
+            description = "Source folder for getting JavaDoc")
+    private @Nullable Path source = Paths.get("keyext.api", "src", "main", "java");
 
     @CommandLine.Option(names = { "-o", "--output" }, description = "Output folder")
     private Path output = Paths.get("out");
@@ -45,7 +45,7 @@ public static void main(String[] args) {
 
     @Override
     public Integer call() throws IOException {
-        var metadata = new ExtractMetaData(Objects.requireNonNull(source));
+        var metadata = new ExtractMetaData();
         metadata.run();
         Files.createDirectories(output);
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index afda1b51c7d..015d57efe0e 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /// Metamodel of the API. This class contains classes which represents the functionality and
 /// interfaces of the API.
@@ -18,10 +19,10 @@ public class Metamodel {
     /// Root class of the metamodel.
     ///
     /// @param endpoints a list of provided services
-    /// @param types a list of known types
+    /// @param types     a list of known types
     public record KeyApi(
             List<Endpoint> endpoints,
-            List<Type> types) {
+            java.util.Map<Class<?>, Type> types) {
     }
 
     /// An {@link Endpoint} is a provided service/method.
@@ -54,7 +55,7 @@ public record Argument(String name, String type) {
     /// @param documentation
     /// @param returnType
     public record ServerRequest(String name, String documentation, List<Argument> args,
-            Type returnType)
+                                Type returnType)
             implements Endpoint {
     }
 
@@ -65,7 +66,7 @@ public record ServerNotification(String name, String documentation, List<Argumen
 
     ///
     public record ClientRequest(String name, String documentation, List<Argument> args,
-            Type returnType)
+                                Type returnType)
             implements Endpoint {
     }
 
@@ -115,7 +116,7 @@ public String identifier() {
 
     /// List of `type`.
     ///
-    /// @param type the type of list elements
+    /// @param type          the type of list elements
     /// @param documentation documentation of this data type
     record ListType(Type type, String documentation) implements Type {
         @Override
@@ -131,12 +132,12 @@ public String identifier() {
 
     /// Data type of objects or struct or record.
     ///
-    /// @param typeName short type name
-    /// @param typeFullName fully-qualified type name
-    /// @param fields list of fields
+    /// @param typeName      short type name
+    /// @param typeFullName  fully-qualified type name
+    /// @param fields        list of fields
     /// @param documentation documentation of data type
     record ObjectType(String typeName, String typeFullName, List<Field> fields,
-            String documentation) implements Type {
+                      String documentation) implements Type {
 
         @Override
         public String name() {
@@ -168,12 +169,12 @@ public String identifier() {
 
     /// Enumeration data type
     ///
-    /// @param typeName short name of the data type
-    /// @param typeFullName fully-qualified name
-    /// @param values possible values of the enum
+    /// @param typeName      short name of the data type
+    /// @param typeFullName  fully-qualified name
+    /// @param values        possible values of the enum
     /// @param documentation documentation of the data type
-    public record EnumType(String typeName, String typeFullName, List<String> values,
-            String documentation) implements Type {
+    public record EnumType(String typeName, String typeFullName, List<EnumConstant> values,
+                           String documentation) implements Type {
 
         @Override
         public String name() {
@@ -183,5 +184,10 @@ public String name() {
         public String identifier() {
             return typeFullName;
         }
+
+    }
+
+    record EnumConstant(String value, @Nullable String documentation) {
     }
+
 }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 8ce112e9b84..4978051598a 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -6,6 +6,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Comparator;
+import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -61,8 +62,15 @@ protected String asPython(Metamodel.Type t) {
     }
 
     protected Metamodel.Type findType(String typeName) {
-        return this.metamodel.types().stream().filter(it -> it.name().equals(typeName)).findFirst()
-                .orElseThrow(() -> new RuntimeException("Could not find type: " + typeName));
+        return this.metamodel.types().values().stream()
+                .filter(it -> {
+                    if (it instanceof Metamodel.ListType lt)
+                        return lt.type().name().equals(typeName);
+                    return it.name().equals(typeName);
+                })
+                .findFirst()
+                .orElse(new Metamodel.ObjectType("...", "...", List.of(), ""));
+                        //new RuntimeException("Could not find type: " + typeName));
     }
 
 
@@ -176,15 +184,15 @@ protected void run() {
                     from abc import abstractmethod, ABCMeta
 
                     """);
-            metamodel.types().forEach(this::printType);
+            metamodel.types().values().forEach(this::printType);
 
             var names =
-                metamodel.types().stream()
+                metamodel.types().values().stream()
                         .map(it -> "\"%s\": %s".formatted(it.identifier(), it.name()))
                         .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES = { %s }%n%n", names);
             var names_reverse =
-                metamodel.types().stream()
+                metamodel.types().values().stream()
                         .map(it -> "\"%s\": \"%s\"".formatted(it.name(), it.identifier()))
                         .collect(Collectors.joining(","));
             out.format("KEY_DATA_CLASSES_REV = { %s }%n%n", names_reverse);
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 9f0349305cd..f6785812c44 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -25,6 +25,10 @@ dependencies {
 
     implementation("com.google.guava:guava:32.1.3-jre")
 
+
+    annotationProcessor "com.github.therapi:therapi-runtime-javadoc-scribe:0.13.0"
+    api "com.github.therapi:therapi-runtime-javadoc:0.13.0"
+
     //for GraalVM annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
 }
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 9464f092314..82298a5604b 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -51,10 +51,10 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
-import org.keyproject.key.api.internal.NodeText;
-import org.keyproject.key.api.remoteapi.ExampleDesc;
+import org.keyproject.key.api.data.NodeText;
+import org.keyproject.key.api.data.ExampleDesc;
 import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.data.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
 import static de.uka.ilkd.key.proof.ProofNodeDescription.collectPathInformation;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index eec8299088b..845e95b6cef 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -7,14 +7,16 @@
 import de.uka.ilkd.key.speclang.Contract;
 
 /**
+ * @param contractId
+ * @param name Name of the contract
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 public record ContractDesc(KeyIdentifications.ContractId contractId, String name,
-        String displayName,
-        String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
-    public static ContractDesc from(KeyIdentifications.EnvironmentId envId, Services services,
-            Contract it) {
+        String displayName, String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
+    public static ContractDesc from(KeyIdentifications.EnvironmentId envId,
+                                    Services services, Contract it) {
         return new ContractDesc(new KeyIdentifications.ContractId(envId, it.getName()),
             it.getName(), it.getDisplayName(), it.getTypeName(),
             it.getHTMLText(services), it.getPlainText(services));
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
similarity index 91%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
index e2f00758a72..15b1bbf476e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.gui.Example;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index eb497323015..8a3797093b3 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -12,7 +12,8 @@
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record FunctionDesc(String name, String sort, SortDesc retSort, List<SortDesc> argSorts,
+public record FunctionDesc(String name, String sort, SortDesc retSort,
+                           List<SortDesc> argSorts,
         boolean rigid,
         boolean unique, boolean skolemConstant) implements KeYDataTransferObject {
     public static FunctionDesc from(Function fn) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
index 522a1c7a0e9..6a4e8711ce5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
@@ -3,5 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+/// An object allowed to be transfered via the JSON RPC
+///
 public interface KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index a58f32ef482..a56deae1d29 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -11,7 +11,6 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import org.keyproject.key.api.internal.NodeText;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index d38653a40f8..bd4c35bbf8a 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -13,6 +13,8 @@
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(Path problemFile, List<Path> classPath, Path bootClassPath,
-        List<Path> includes) implements KeYDataTransferObject {
+public record LoadParams(Path problemFile,
+                         List<Path> classPath,
+                         Path bootClassPath,
+                         List<Path> includes) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeText.java
similarity index 89%
rename from keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/NodeText.java
index 84898829e9a..ddc57f452da 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeText.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api.internal;
+package org.keyproject.key.api.data;
 
 import de.uka.ilkd.key.pp.InitialPositionTable;
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
index bc3a20ef0b9..c8be657b4b5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import java.util.List;
+
 /**
  * @author Alexander Weigl
  * @version 1 (15.10.23)
  */
-public record PredicateDesc(String name, String[] argSorts) implements KeYDataTransferObject {
+public record PredicateDesc(String name, List<SortDesc> argSorts) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintOptions.java
similarity index 89%
rename from keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
rename to keyext.api/src/main/java/org/keyproject/key/api/data/PrintOptions.java
index 845c485ca7e..aad19e86abe 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintOptions.java
@@ -1,7 +1,7 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api.remoteapi;
+package org.keyproject.key.api.data;
 
 /**
  * @author Alexander Weigl
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
index 7ab1973e3da..f4d1722e1c9 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -11,7 +11,7 @@
  */
 public record ProofScriptCommandDesc(String macroId, String documentation)
         implements KeYDataTransferObject {
-    public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
+    public static ProofScriptCommandDesc from(ProofScriptCommand proofScriptCommand) {
         return new ProofScriptCommandDesc(proofScriptCommand.getName(),
             proofScriptCommand.getDocumentation());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
new file mode 100644
index 00000000000..1086952b487
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
@@ -0,0 +1,10 @@
+package org.keyproject.key.api.data;
+
+/**
+ * TextRange specifies a range of integer numbers e.g. character positions.
+ *
+ * @param start this range's (included) start position.
+ * @param end   this range's (excluded) end position.
+ */
+public record TextRange(int start, int end) implements KeYDataTransferObject {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index 5f19f881e9d..e2ee7dc9a8c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -8,6 +8,7 @@
 
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.keyproject.key.api.data.ExampleDesc;
 
 @JsonSegment("examples")
 public interface ExampleApi {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index 919ed5b645d..b1f2e1ce5d4 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -4,34 +4,27 @@
 package org.keyproject.key.api.remoteclient;
 
 import de.uka.ilkd.key.pp.Range;
+import org.jspecify.annotations.Nullable;
+import org.keyproject.key.api.data.TextRange;
+
+/**
+ * @param uri       The uri to show.
+ * @param external  Indicates to show the resource in an external program.
+ *                  To show, for example, `https://code.visualstudio.com/`
+ *                  in the default WEB browser set `external` to `true`.
+ * @param takeFocus An optional property to indicate whether the editor
+ *                  showing the document should take focus or not.
+ *                  Clients might ignore this property if an external
+ *                  program is started.
+ * @param selection An optional selection range if the document is a text
+ *                  document. Clients might ignore the property if an
+ *                  external program is started or the file is not a text
+ *                  file.
+ */
 
 public record ShowDocumentParams(
-        /**
-         * The uri to show.
-         */
         String uri,
-
-        /**
-         * Indicates to show the resource in an external program.
-         * To show, for example, `https://code.visualstudio.com/`
-         * in the default WEB browser set `external` to `true`.
-         */
-        Boolean external,
-
-        /**
-         * An optional property to indicate whether the editor
-         * showing the document should take focus or not.
-         * Clients might ignore this property if an external
-         * program is started.
-         */
-        Boolean takeFocus,
-
-        /**
-         * An optional selection range if the document is a text
-         * document. Clients might ignore the property if an
-         * external program is started or the file is not a text
-         * file.
-         */
-        Range selection) {
-
+        boolean external,
+        boolean takeFocus,
+        @Nullable TextRange selection) {
 }
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 2072be846ce..5abaa896762 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -30,7 +30,7 @@
 import org.keyproject.key.api.data.TaskFinishedInfo;
 import org.keyproject.key.api.data.TaskStartedInfo;
 import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.data.PrintOptions;
 import org.keyproject.key.api.remoteclient.*;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;

From 0f23b99c485fff1b291537a592e6877ef0348463 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 29 Nov 2025 06:30:22 +0100
Subject: [PATCH 47/50] better documentation

---
 keyext.api.doc/build.gradle                   |   2 +-
 .../org/key_project/key/api/doc/DocGen.java   | 152 ++++++---------
 .../key/api/doc/ExtractMetaData.java          | 127 +++++++++----
 .../org/key_project/key/api/doc/Main.java     |   2 +-
 .../key_project/key/api/doc/Metamodel.java    |  80 +++++---
 .../key/api/doc/PythonGenerator.java          |   2 +-
 .../src/main/resources/templates/docs.ftl     | 177 ++++++++++++++++++
 .../src/main/resources/templates/test.ftl     |   2 +
 .../keyproject/key/api/data/ContractDesc.java |  11 +-
 .../key/api/data/TaskFinishedInfo.java        |   3 +-
 .../key/api/data/TaskStartedInfo.java         |   6 +-
 .../keyproject/key/api/data/TraceValue.java   |  28 ++-
 .../key/api/remoteapi/ServerManagement.java   |  30 +--
 .../key/api/remoteclient/ClientApi.java       |  70 +++----
 .../api/remoteclient/LogMessageParams.java    |  15 +-
 .../key/api/remoteclient/LogTraceParams.java  |  18 +-
 .../api/remoteclient/MessageActionItem.java   |   9 +-
 .../api/remoteclient/ShowDocumentParams.java  |   3 +-
 .../api/remoteclient/ShowDocumentResult.java  |  11 +-
 .../api/remoteclient/ShowMessageParams.java   |  16 +-
 .../ShowMessageRequestParams.java             |  20 +-
 .../org/keyproject/key/api/SimpleClient.java  |   9 +-
 .../formal/keyextclientjava/MyKeyClient.java  |  10 +-
 23 files changed, 504 insertions(+), 299 deletions(-)
 create mode 100644 keyext.api.doc/src/main/resources/templates/docs.ftl
 create mode 100644 keyext.api.doc/src/main/resources/templates/test.ftl

diff --git a/keyext.api.doc/build.gradle b/keyext.api.doc/build.gradle
index b1c0c645a85..5522b0a95c7 100644
--- a/keyext.api.doc/build.gradle
+++ b/keyext.api.doc/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(project(":keyext.api"))
-    //implementation("com.github.javaparser:javaparser-symbol-solver-core:3.26.1")
+    implementation("org.freemarker:freemarker:2.3.34")
     implementation("info.picocli:picocli:4.7.6")
 }
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index 191008efd1d..32acdf9a71b 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -1,26 +1,28 @@
 /* This file is part of KeY - https://key-project.org
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
-package org.key_project.key.api.doc;/*
- * This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version
- * 2
- * SPDX-License-Identifier: GPL-2.0-only
- */
+package org.key_project.key.api.doc;
+
+import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
+import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.TemplateException;
 
-import java.io.PrintWriter;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
+ * Generation of Markdown documentation.
+ *
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
 public class DocGen implements Supplier<String> {
     private final Metamodel.KeyApi metamodel;
-    private PrintWriter out;
 
     public DocGen(Metamodel.KeyApi metamodel) {
         this.metamodel = metamodel;
@@ -29,94 +31,50 @@ public DocGen(Metamodel.KeyApi metamodel) {
     @Override
     public String get() {
         final StringWriter target = new StringWriter();
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-            printHeader();
-
-            out.format("## Types%n");
-            metamodel.types().values()
-                    .stream().sorted(Comparator.comparing(Metamodel.Type::name))
-                    .forEach(this::printType);
-
-            out.format("## Endpoints%n");
-            metamodel.endpoints()
-                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
-                    .forEach(this::endpoints);
-            printFooter();
-        }
-        return target.toString();
-    }
-
-    private void printFooter() {
-
-    }
-
-    private void printHeader() {
-
-
-    }
-
-    private void endpoints(Metamodel.Endpoint endpoint) {
-        var direction = switch (endpoint) {
-            case Metamodel.ServerRequest sr -> "client -> server";
-            case Metamodel.ClientRequest sr -> "server -> client";
-            case Metamodel.ServerNotification sr -> "client ~~> server";
-            case Metamodel.ClientNotification sr -> "server ~~> client";
-        };
-
-        out.format("### %s (`%s`) %n%n", endpoint.name(), direction);
-        out.format("```%n");
-        var args = endpoint.args();
-        final var a = args.stream()
-                .map(it -> "%s : %s".formatted(it.name(), it.type()))
-                .collect(Collectors.joining(", "));
-        switch (endpoint) {
-            case Metamodel.ServerRequest sr ->
-                    out.format("Server.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ClientRequest sr ->
-                    out.format("Client.%s( %s ) -> %s%n", endpoint.name(), a, sr.returnType().name());
-            case Metamodel.ServerNotification ignored -> out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-            case Metamodel.ClientNotification ignored -> out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
-            default -> {
-            }
-        }
-        out.format("```%n");
-
-        out.println(endpoint.documentation());
-        out.println();
-    }
-
-    private void printType(Metamodel.Type type) {
-        out.format("### Type: %s%n", type.name());
-        if (type instanceof Metamodel.ObjectType ot) {
-            out.format("""
-                    %s 
-                    ```                    
-                    type %s {
-                     %s
-                    }
-                    ```
-                    """.formatted(
-                    type.documentation(),
-                    type.name(),
-                    ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                            .map(it -> "  /* %s */\n  %s : %s".formatted(it.documentation(), it.name(), it.type()))
-                            .collect(Collectors.joining("\n"))));
-        }
-
-        if (type instanceof Metamodel.EnumType et) {
-            out.format("""
-                    ```
-                    %s
-                    enum %s { %s }
-                    ```
-                    """.formatted(
-                    type.documentation(),
-                    type.name(),
-                    et.values().stream().map(it -> "  /* %s */\n  %s".formatted(it.documentation(), it.value())).collect(Collectors.joining("\n"))));
-                    out.format(type.documentation());
+        try  {
+            // 1) Configure FreeMarker
+            var cfg = new Configuration(Configuration.VERSION_2_3_32);
+            cfg.setClassForTemplateLoading(DocGen.class, "/templates"); // classpath
+            cfg.setDefaultEncoding("UTF-8");
+            //cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+            cfg.setLogTemplateExceptions(false);
+            cfg.setWrapUncheckedExceptions(true);
+            cfg.setFallbackOnNullLoopVariable(false);
+            //cfg.setOutputFormat(HTMLOutputFormat.INSTANCE);
+
+            // Use DefaultObjectWrapper to expose fields of objects in the data model
+            DefaultObjectWrapper wrapper = new DefaultObjectWrapper(Configuration.VERSION_2_3_32);
+            wrapper.setExposeFields(true);
+            wrapper.setMethodsShadowItems(true);
+            wrapper.setRecordZeroArgumentNonVoidMethodPolicy(ZeroArgumentNonVoidMethodPolicy.BOTH_METHOD_AND_PROPERTY_UNLESS_BEAN_PROPERTY_READ_METHOD);
+            wrapper.setForceLegacyNonListCollections(false);
+            wrapper.setDefaultDateType(freemarker.template.TemplateDateModel.DATETIME);
+            cfg.setObjectWrapper(wrapper);
+
+            // 2) Build the data-model
+            Map<String, Object> model = new TreeMap<>();
+
+            model.put("segmentDocumentation", metamodel.segmentDocumentation());
+
+            model.put("endpoints",
+                    metamodel.endpoints()
+                            .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                            .toList());
+
+            model.put("types",
+                    metamodel.types().values()
+                            .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                            .toList());
+
+
+            // 3) Get template
+            var tpl = cfg.getTemplate("docs.ftl");
+
+            // 4) Merge and output
+            tpl.process(model, target);
+            return target.toString();
+        } catch (IOException | TemplateException e) {
+            throw new RuntimeException(e);
         }
-        out.format(type.documentation());
-        out.println();
     }
 }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 3d6f61c866d..0ba6ad8a121 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -8,16 +8,15 @@
  * SPDX-License-Identifier: GPL-2.0-only
  */
 
-import com.github.therapi.runtimejavadoc.ClassJavadoc;
-import com.github.therapi.runtimejavadoc.FieldJavadoc;
-import com.github.therapi.runtimejavadoc.MethodJavadoc;
-import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
+import com.github.therapi.runtimejavadoc.*;
 import de.uka.ilkd.key.proof.Proof;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.jspecify.annotations.Nullable;
+import org.key_project.key.api.doc.Metamodel.HelpText;
+import org.key_project.key.api.doc.Metamodel.HelpTextEntry;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -25,6 +24,7 @@
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
 
 /**
  * @author Alexander Weigl
@@ -34,9 +34,11 @@
 public class ExtractMetaData implements Runnable {
     private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
     private final Map<Class<?>, Metamodel.Type> types = new HashMap<>();
-    private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types);
+    private final Map<String, HelpText> segDocumentation = new TreeMap<>();
+    private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types, segDocumentation);
 
-    public ExtractMetaData() {}
+    public ExtractMetaData() {
+    }
 
     @Override
     public void run() {
@@ -47,6 +49,15 @@ public void run() {
         for (Method method : ClientApi.class.getMethods()) {
             addClientEndpoint(method);
         }
+
+        for (var anInterface : KeyApi.class.getInterfaces()) {
+            var js = anInterface.getAnnotation(JsonSegment.class);
+            if (js != null) {
+                var key = js.value();
+                var doc = findDocumentation(anInterface);
+                segDocumentation.put(key, doc);
+            }
+        }
     }
 
     private void addServerEndpoint(Method method) {
@@ -88,19 +99,23 @@ private void addServerEndpoint(Method method) {
                 "Method " + method + " is neither a request nor a notification");
     }
 
-    private String findDocumentation(Method method) {
+    private @Nullable HelpText findDocumentation(Method method) {
         MethodJavadoc javadoc = RuntimeJavadoc.getJavadoc(method);
-        return javadoc.getParams().toString() +
-                javadoc.getThrows() +
-                javadoc.getReturns().toString();
-
-        /*return findCompilationUnit(method.getDeclaringClass())
-                .map(it -> it.getMethodsByName(method.getName()))
-                .map(List::getFirst)
-                .flatMap(NodeWithJavadoc::getJavadoc)
-                .map(Javadoc::getDescription)
-                .map(JavadocDescription::toText)
-                .orElse("");*/
+        if (javadoc.isEmpty()) return null;
+
+        final var visitor = new ToHtmlStringCommentVisitor();
+        javadoc.getComment().visit(visitor);
+
+        var t = javadoc.getThrows().stream().map(it ->
+                new HelpTextEntry(it.getName(), it.getComment().toString()));
+
+        var p = javadoc.getParams().stream().map(it ->
+                new HelpTextEntry(it.getName(), it.getComment().toString()));
+
+        var r = Stream.of(new HelpTextEntry("returns", javadoc.getReturns().toString()));
+
+        return new HelpText(visitor.build(),
+                Stream.concat(r, Stream.concat(p, t)).toList());
     }
 
     private List<Metamodel.Argument> translate(Parameter[] parameters) {
@@ -147,7 +162,7 @@ private Metamodel.Type getOrFindType(Class<?> type) {
         if (type == List.class) {
             // TODO try to get the type below.
             var subType = getOrFindType(type.getTypeParameters()[0]);
-            return new Metamodel.ListType(subType, "");
+            return new Metamodel.ListType(subType);
         }
 
         if (type == Class.class || type == Constructor.class || type == Proof.class) {
@@ -163,37 +178,40 @@ private Metamodel.Type getOrFindType(Class<?> type) {
     }
 
     private Metamodel.Type createType(Class<?> type) {
-
         final var documentation = findDocumentation(type);
-        if (type.isEnum())
+        if (type.isEnum()) {
             return new Metamodel.EnumType(type.getSimpleName(), type.getName(),
                     Arrays.stream(type.getEnumConstants())
                             .map(
                                     it ->
                                             new Metamodel.EnumConstant(it.toString(),
-                                                    findDocumentation(type, it)))
+                                                    findDocumentationEnum(type, it)))
                             .toList(),
                     documentation);
-
+        }
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(),
                 documentation);
         final var list = Arrays.stream(type.getDeclaredFields())
-                .map(it -> new Metamodel.Field(it.getName(), getOrFindTypeName(it.getGenericType()),
-                        findDocumentation(it)
-                        ))
+                .map(it ->
+                        new Metamodel.Field(it.getName(), getOrFindTypeName(it.getGenericType()),
+                                type.isRecord()
+                                        ? findDocumentationRecord(type, it.getName())
+                                        : findDocumentation(it)))
                 .toList();
         obj.fields().addAll(list);
         return obj;
     }
 
-    private String findDocumentation(Field it) {
+    private @Nullable HelpText findDocumentation(Field it) {
         var javadoc = RuntimeJavadoc.getJavadoc(it);
+        if (javadoc.isEmpty()) return null;
         return printFieldDocumentation(javadoc);
     }
 
-    private @Nullable String findDocumentation(Class<?> type, Object enumConstant) {
+    private @Nullable HelpText findDocumentationEnum(Class<?> type, Object enumConstant) {
         ClassJavadoc javadoc = RuntimeJavadoc.getJavadoc(type);
+        if (javadoc.isEmpty()) return null;
         for (var cdoc : javadoc.getEnumConstants()) {
             if (cdoc.getName().equalsIgnoreCase(enumConstant.toString())) {
                 return printFieldDocumentation(cdoc);
@@ -202,18 +220,45 @@ private String findDocumentation(Field it) {
         return null;
     }
 
-    private static String printFieldDocumentation(FieldJavadoc cdoc) {
-        return cdoc.getComment().toString() +
-                (cdoc.getOther().isEmpty() ? "" : cdoc.getOther().toString()) +
-                (cdoc.getSeeAlso().isEmpty() ? "" : cdoc.getSeeAlso().toString());
+    private @Nullable HelpText findDocumentationRecord(Class<?> type, String name) {
+        ClassJavadoc javadoc = RuntimeJavadoc.getJavadoc(type);
+        if (javadoc.isEmpty()) return null;
+        for (var cdoc : javadoc.getRecordComponents()) {
+            if (cdoc.getName().equalsIgnoreCase(name)) {
+                return new HelpText(cdoc.getComment().toString(), List.of());
+            }
+        }
+        return null;
     }
 
-    private String findDocumentation(Class<?> type) {
+    private static HelpText printFieldDocumentation(FieldJavadoc javadoc) {
+        final var visitor = new ToHtmlStringCommentVisitor();
+        javadoc.getComment().visit(visitor);
+
+        var t = javadoc.getOther().stream().map(it ->
+                new HelpTextEntry(it.getName(), it.getComment().toString()));
+
+        var p = javadoc.getSeeAlso().stream().map(it ->
+                new HelpTextEntry(it.getSeeAlsoType().toString(), it.getStringLiteral()));
+
+        return new HelpText(visitor.build(), Stream.concat(p, t).toList());
+    }
+
+    private @Nullable HelpText findDocumentation(Class<?> type) {
         ClassJavadoc classDoc = RuntimeJavadoc.getJavadoc(type);
         if (!classDoc.isEmpty()) { // optionally skip absent documentation
-            return classDoc.getComment().toString() + classDoc.getOther() + classDoc.getSeeAlso();
+            var other = classDoc.getOther()
+                    .stream().map(it -> new HelpTextEntry(it.getName(),
+                            it.getComment().toString()));
+            var also = classDoc.getSeeAlso()
+                    .stream().map(it -> new HelpTextEntry(it.getSeeAlsoType().toString(),
+                            it.getStringLiteral()));
+
+            return new HelpText(
+                    classDoc.getComment().toString(),
+                    Stream.concat(other, also).toList());
         }
-        return "";
+        return null;
     }
 
     private void addClientEndpoint(Method method) {
@@ -243,7 +288,8 @@ private void addClientEndpoint(Method method) {
         }
     }
 
-    private static String callMethodName(String method, String segment, @Nullable String userValue,
+    private static String callMethodName(String method, String segment,
+                                         @Nullable String userValue,
                                          boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
@@ -334,8 +380,7 @@ else if (type == CompletableFuture.class) {
 
     private Metamodel.@Nullable Type getOrFindType(Type genericReturnType) {
         switch (genericReturnType) {
-            case GenericArrayType a ->
-                    throw new RuntimeException("Unwanted type found: " + genericReturnType);
+            case GenericArrayType a -> throw new RuntimeException("Unwanted type found: " + genericReturnType);
             case Class<?> c -> {
                 return getOrFindType(c);
             }
@@ -346,16 +391,16 @@ else if (type == CompletableFuture.class) {
                 }
                 if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
                     var base = getOrFindType(pt.getActualTypeArguments()[0]);
-                    return new Metamodel.ListType(base, "");
+                    return new Metamodel.ListType(base);
                 }
 
                 if (Objects.equals(pt.getRawType().getTypeName(), Either.class.getTypeName())) {
                     var base1 = getOrFindType(pt.getActualTypeArguments()[0]);
                     var base2 = getOrFindType(pt.getActualTypeArguments()[1]);
-                    return new Metamodel.EitherType(base1, base2, "");
+                    return new Metamodel.EitherType(base1, base2);
                 }
             }
-            case null, default -> {
+            default -> {
             }
         }
 
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
index 80ce14543b3..943c7849a72 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
@@ -50,7 +50,7 @@ public Integer call() throws IOException {
         Files.createDirectories(output);
 
         runGenerator(metadata.getApi(), "api.meta.json", (a) -> () -> getGson().toJson(a));
-        runGenerator(metadata.getApi(), "api.meta.md", DocGen::new);
+        runGenerator(metadata.getApi(), "api.meta.html", DocGen::new);
         runGenerator(metadata.getApi(), "keydata.py", PythonGenerator.PyDataGen::new);
         runGenerator(metadata.getApi(), "server.py", PythonGenerator.PyApiGen::new);
         return 0;
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index 015d57efe0e..51116f829da 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -4,6 +4,7 @@
 package org.key_project.key.api.doc;
 
 import java.util.List;
+import java.util.Map;
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -22,16 +23,26 @@ public class Metamodel {
     /// @param types     a list of known types
     public record KeyApi(
             List<Endpoint> endpoints,
-            java.util.Map<Class<?>, Type> types) {
+            java.util.Map<Class<?>, Type> types,
+            Map<String, HelpText> segmentDocumentation) {
     }
 
+    /// Javadoc texts
+    public record HelpText(String text, List<HelpTextEntry> others) {
+    }
+
+    /// Javadoc categories
+    public record HelpTextEntry(String name, String value) {
+    }
+
+
     /// An {@link Endpoint} is a provided service/method.
-    sealed interface Endpoint {
+    public sealed interface Endpoint {
         /// complete name of the service
         String name();
 
         /// a markdown documentation
-        String documentation();
+        @Nullable HelpText documentation();
 
         default String kind() {
             return getClass().getName();
@@ -39,6 +50,25 @@ default String kind() {
 
         /// a list of its arguments
         List<Argument> args();
+
+        ///
+        default String segment() {
+            int idx = name().indexOf("/");
+            if (idx == -1) {
+                return "";
+            }
+            return name().substring(0, idx);
+        }
+
+        /// sender of this invocation
+        default String sender() {
+            return getClass().getSimpleName().startsWith("Server") ? "Client" : "Server";
+        }
+
+        ///
+        default boolean isAsync() {
+            return getClass().getSimpleName().endsWith("Notification");
+        }
     }
 
     /// A [Argument] of an endpoint
@@ -54,31 +84,31 @@ public record Argument(String name, String type) {
     /// @param args
     /// @param documentation
     /// @param returnType
-    public record ServerRequest(String name, String documentation, List<Argument> args,
+    public record ServerRequest(String name, @Nullable HelpText documentation, List<Argument> args,
                                 Type returnType)
             implements Endpoint {
     }
 
     ///
-    public record ServerNotification(String name, String documentation, List<Argument> args)
+    public record ServerNotification(String name, @Nullable HelpText documentation, List<Argument> args)
             implements Endpoint {
     }
 
     ///
-    public record ClientRequest(String name, String documentation, List<Argument> args,
+    public record ClientRequest(String name, @Nullable HelpText documentation, List<Argument> args,
                                 Type returnType)
             implements Endpoint {
     }
 
     ///
-    public record ClientNotification(String name, String documentation, List<Argument> args)
+    public record ClientNotification(String name, @Nullable HelpText documentation, List<Argument> args)
             implements Endpoint {
     }
 
     ///
-    public record Field(String name, /* Type */ String type, String documentation) {
+    public record Field(String name, /* Type */ String type, @Nullable HelpText documentation) {
         Field(String name, String type) {
-            this(name, type, "");
+            this(name, type, null);
         }
     }
 
@@ -89,23 +119,24 @@ default String kind() {
         }
 
         /// Documentation of the data type
-        String documentation();
+        @Nullable HelpText documentation();
 
         /// name of the data type
         String name();
 
         ///
         String identifier();
+
     }
 
 
     /// Typical built-in data types supported by the API
-    enum BuiltinType implements Type {
+    public enum BuiltinType implements Type {
         INT, LONG, STRING, BOOL, DOUBLE;
 
         @Override
-        public String documentation() {
-            return "built-in data type";
+        public HelpText documentation() {
+            return new HelpText("built-in data type", List.of());
         }
 
         public String identifier() {
@@ -117,8 +148,7 @@ public String identifier() {
     /// List of `type`.
     ///
     /// @param type          the type of list elements
-    /// @param documentation documentation of this data type
-    record ListType(Type type, String documentation) implements Type {
+    public record ListType(Type type) implements Type {
         @Override
         public String name() {
             return type().name() + "[]";
@@ -128,6 +158,10 @@ public String identifier() {
             return type().identifier() + "[]";
         }
 
+        @Override
+        public @Nullable HelpText documentation() {
+            return null;
+        }
     }
 
     /// Data type of objects or struct or record.
@@ -136,9 +170,8 @@ public String identifier() {
     /// @param typeFullName  fully-qualified type name
     /// @param fields        list of fields
     /// @param documentation documentation of data type
-    record ObjectType(String typeName, String typeFullName, List<Field> fields,
-                      String documentation) implements Type {
-
+    public record ObjectType(String typeName, String typeFullName, List<Field> fields,
+                             HelpText documentation) implements Type {
         @Override
         public String name() {
             return typeName;
@@ -153,8 +186,7 @@ public String identifier() {
     ///
     /// @param a
     /// @param b
-    /// @param documentation
-    public record EitherType(Type a, Type b, String documentation) implements Type {
+    public record EitherType(Type a, Type b) implements Type {
 
         @Override
         public String name() {
@@ -165,6 +197,10 @@ public String identifier() {
             return name();
         }
 
+        @Override
+        public @Nullable HelpText documentation() {
+            return null;
+        }
     }
 
     /// Enumeration data type
@@ -174,7 +210,7 @@ public String identifier() {
     /// @param values        possible values of the enum
     /// @param documentation documentation of the data type
     public record EnumType(String typeName, String typeFullName, List<EnumConstant> values,
-                           String documentation) implements Type {
+                           HelpText documentation) implements Type {
 
         @Override
         public String name() {
@@ -187,7 +223,7 @@ public String identifier() {
 
     }
 
-    record EnumConstant(String value, @Nullable String documentation) {
+    public record EnumConstant(String value, @Nullable HelpText documentation) {
     }
 
 }
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index 4978051598a..a4e44b60eb5 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -69,7 +69,7 @@ protected Metamodel.Type findType(String typeName) {
                     return it.name().equals(typeName);
                 })
                 .findFirst()
-                .orElse(new Metamodel.ObjectType("...", "...", List.of(), ""));
+                .orElse(new Metamodel.ObjectType("...", "...", List.of(), null));
                         //new RuntimeException("Could not find type: " + typeName));
     }
 
diff --git a/keyext.api.doc/src/main/resources/templates/docs.ftl b/keyext.api.doc/src/main/resources/templates/docs.ftl
new file mode 100644
index 00000000000..810e6fbebee
--- /dev/null
+++ b/keyext.api.doc/src/main/resources/templates/docs.ftl
@@ -0,0 +1,177 @@
+<#-- @ftlvariable name="types" type="java.util.Collection<org.key_project.key.api.doc.Metamodel.Type>" -->
+<#-- @ftlvariable name="endpoints" type="java.util.Collection<org.key_project.key.api.doc.Metamodel.Endpoint>" -->
+<#-- @ftlvariable name="segmentDocumentation" type="java.util.Map<String,String>" -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/main.618322db.min.css"/>
+    <link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/palette.ab4e12ef.min.css">
+    <title></title>
+</head>
+<body>
+
+<style>
+    html {
+        font-family: sans-serif;
+        width: 60em;
+        margin: auto;
+    }
+
+    div.data-type {
+        span.kind {
+            background: darkblue;
+            color: white;
+            padding: 1ex;
+            font-size: 80%;
+            border-radius: .3ex;
+        }
+    }
+
+    div.data-type.enum {
+        span.kind {
+            background: darkgreen;
+        }
+    }
+
+    .entry.field {
+        padding-left: 2em;
+    }
+
+    h4 .async, h4 .sync {
+        width: 10em;
+        padding: .5ex;
+        font-size: 80%;
+        display: inline-block;
+        background: lightcoral;
+    }
+
+    .direction {
+        font-family: "Fira Code Light", monospace;
+        margin-left: 5ex;
+    }
+</style>
+
+<h3>Types</h3>
+<#list types as type>
+    <#assign isEnum = true>
+    <#if type.fields??>
+        <#assign isEnum = false>
+    </#if>
+
+    <div id="${type.name()}" class="data-type ${isEnum?string("enum","type")}">
+        <h3>${type.name()} <span class="kind"> ${isEnum?string("enum","type")}</span></h3>
+        <code class="highlight">
+            <span class="k">${isEnum?string("enum","type")}</span>
+            <span class="kc">${type.name()}</span> { <br/>
+            <#if type.fields??>
+                <#list type.fields as field>
+                    <div class="entry field">
+                        <#if field.documentation()??>
+                            <div class="cm">/* ${field.documentation.text} */</div>
+                        </#if>
+                        <div><span class="kc">${field.type()}</span>&nbsp;<span
+                                    class="nv">${field.name()}</span>;
+                        </div>
+                    </div>
+                </#list>
+            </#if>
+            <#if type.values??>
+                <#list type.values()?sort as value>
+                    <#if value.documentation??>
+                        /* ${value.documentation.text} */
+                    </#if>
+                    ${value.value()}
+                </#list>
+            </#if>
+            }
+        </code>
+        <#if type.documentation??>
+            <div class="documentation">
+                <p>
+                    ${type.documentation.text}
+                </p>
+                <ul>
+                    <#list type.documentation.others as o>
+                        <li><strong>${o.name}:</strong> ${o.value}</li>
+                    </#list>
+                </ul>
+            </div>
+        </#if>
+    </div>
+</#list>
+
+
+<h2 id="endpoints">Endpoints</h2>
+<#assign lastSegment = "">
+<div>
+    <#list endpoints as ep>
+        <#if lastSegment!=ep.segment()>
+            <#assign lastSegment = ep.segment()>
+            <h3 id="${lastSegment}">Segment: ${lastSegment}</h3>
+            <#if segmentDocumentation[lastSegment]??>
+                <#assign doc = segmentDocumentation[lastSegment]>
+                <div class="documentation">
+                    <p>
+                        ${doc.text}
+                    </p>
+                    <ul>
+                        <#list doc.others as o>
+                            <li><strong>${o.name}:</strong> ${o.value}</li>
+                        </#list>
+                    </ul>
+                </div>
+            </#if>
+        </#if>
+
+        <div id="${ep.name()}" class="endpoint ${ep.isAsync()?string("async","sync")} ${ep.sender()}">
+            <h4>
+                <#if ep.isAsync()>
+                    <span class="async">Notification:</span>
+                <#else>
+                    <span class="sync">Request:</span>
+                </#if>
+                ${ep.name()}
+                <span class="direction">
+                    <#if ep.sender() == "Server" && ep.isAsync()>
+                        server ~~> client
+                    <#elseif ep.sender() == "Server" && !ep.isAsync()>
+                        server --> client
+                    <#elseif ep.sender() == "Client" && !ep.isAsync()>
+                        client --> server
+                    <#elseif ep.sender() == "Client" && ep.isAsync()>
+                        client ~~> server
+                    </#if>
+                </span>
+            </h4>
+
+            <code class="highlight">
+                ${ep.name()}<span class="p">(</span>
+                <#list ep.args() as arg>
+                    <span class="kc">${arg.type}</span>
+                    <span class="nv">${arg.name}</span><#sep><span class="p">,</span></#sep>
+                </#list>
+                <span class="p">)</span>
+                <#if ep.returnType??>
+                    <span class="p">:</span>
+                    <span class="kc">${ep.returnType.identifier()}</span>
+                </#if>
+            </code>
+            <#if ep.documentation??>
+                <div class="documentation">
+                    <p>
+                        ${ep.documentation.text}
+                    </p>
+                    <ul>
+                        <#list ep.documentation.others as o>
+                            <li><strong>${o.name}:</strong> ${o.value}</li>
+                        </#list>
+                    </ul>
+                </div>
+            </#if>
+        </div>
+    </#list>
+</div>
+
+</body>
+</html>
diff --git a/keyext.api.doc/src/main/resources/templates/test.ftl b/keyext.api.doc/src/main/resources/templates/test.ftl
new file mode 100644
index 00000000000..741952e3fb2
--- /dev/null
+++ b/keyext.api.doc/src/main/resources/templates/test.ftl
@@ -0,0 +1,2 @@
+<#-- @ftlvariable name="type" type="org.key_project.key.api.doc.Metamodel.ObjectType" -->
+
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index 845e95b6cef..d5070419f1c 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -7,8 +7,17 @@
 import de.uka.ilkd.key.speclang.Contract;
 
 /**
- * @param contractId
+ * Description of a loadable contract in KeY.
+ *
+ * Contracts can be arbitrary objects, representing a functional, dependency, information flow, etc. contract.
+ * Contracts can be loaded into proofs.
+ *
+ * @param contractId an identifier of the contract
  * @param name Name of the contract
+ * @param displayName Showable name
+ * @param typeName  the typename which is associated with this contract
+ * @param htmlText  content of the contract as html text
+ * @param plainText content of the contract as plain text
  *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
index 5a4042dd009..4d5898443cf 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public record TaskFinishedInfo(long time, int appliedRules, int closedGoals)
-        implements KeYDataTransferObject {
+public record TaskFinishedInfo(long time, int appliedRules, int closedGoals) implements KeYDataTransferObject {
     public static TaskFinishedInfo from(org.key_project.prover.engine.TaskFinishedInfo info) {
         return new TaskFinishedInfo(info.getTime(), info.getAppliedRules(), info.getClosedGoals());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index 895523c3796..bf2001a6dcd 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public record TaskStartedInfo(String message, int size,
-        org.key_project.prover.engine.TaskStartedInfo.TaskKind kind)
-        implements KeYDataTransferObject {
+import org.key_project.prover.engine.TaskStartedInfo.TaskKind;
+
+public record TaskStartedInfo(String message, int size, TaskKind kind) implements KeYDataTransferObject {
     public static TaskStartedInfo from(org.key_project.prover.engine.TaskStartedInfo info) {
         return new TaskStartedInfo(info.message(), info.size(), info.kind());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
index b030d4808f2..45ba6db4862 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TraceValue.java
@@ -4,5 +4,31 @@
 package org.keyproject.key.api.data;
 
 public enum TraceValue implements KeYDataTransferObject {
-    Off, Message, All;
+    /**
+     *
+     */
+    Off,
+    /**
+     * An error message.
+     */
+    Error,
+    /**
+     * A warning message.
+     */
+    Warning,
+    /**
+     * An information message.
+     */
+    Info,
+    /**
+     * A log message.
+     */
+    Log,
+    /**
+     * A debug message.
+     *
+     * @proposed
+     * @since 3.18.0
+     */
+    Debug
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
index bcbff9a04ff..cb74dd5fb24 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -11,13 +11,14 @@
 import org.keyproject.key.api.data.TraceValue;
 
 /**
+ * This is a text and should appear in the documentation
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 @JsonSegment("server")
 public interface ServerManagement {
     /**
-     * Shutdown Request (:leftwards_arrow_with_hook:)
      * The shutdown request is sent from the client to the server. It asks the server to shut down,
      * but to not exit (otherwise the response might not be delivered correctly to the client).
      * There is a separate exit notification that asks the server to exit. Clients must not send any
@@ -27,42 +28,27 @@ public interface ServerManagement {
      * <p>
      * If a server receives requests after a shutdown request those requests should error with
      * InvalidRequest.
-     * <p>
-     * Request:
-     * <p>
-     * method: ‘shutdown’
-     * params: none
-     * Response:
-     * <p>
-     * result: null
-     * error: code and message set in case an exception happens during shutdown request.
      */
     @JsonRequest
     CompletableFuture<Boolean> shutdown();
 
     /**
-     * Exit Notification (:arrow_right:)
      * A notification to ask the server to exit its process. The server should exit with success
      * code 0 if the shutdown request has been received before; otherwise with error code 1.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘exit’
-     * params: none
      */
     @JsonNotification
     void exit();
 
 
-    interface SetTraceParams {
-        /**
-         * The new value that should be assigned to the trace setting.
-         */
-        TraceValue value = null;
+    /**
+     * Values
+     *
+     * @param value The new value that should be assigned to the trace setting.
+     */
+    public record SetTraceParams(TraceValue value) {
     }
 
     /**
-     * SetTrace Notification
      * A notification that should be used by the client to modify the trace setting of the server.
      */
     @JsonNotification
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index 4d1a08c5662..a5d3a1deb39 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -9,78 +9,82 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+import org.jspecify.annotations.NullMarked;
+import org.keyproject.key.api.data.TaskFinishedInfo;
+import org.keyproject.key.api.data.TaskStartedInfo;
 
-@JsonSegment("client")
+/**
+ * This segment contains the functionalities that a client needs to implement.
+ * Mainly, it is logging and displaying of information.
+ */
+@JsonSegment("client") @NullMarked
 public interface ClientApi {
-    @JsonNotification
-    void sayHello(String e);
-
     /**
-     * LogTrace Notification (:arrow_left:)
-     * A notification to log the trace of the server’s execution. The amount and content of these
-     * notifications depends on the current trace configuration. If trace is 'off', the server
-     * should not send any logTrace notification. If trace is 'messages', the server should not add
-     * the 'verbose' field in the LogTraceParams.
+     * A notification to log the trace of the server’s execution.
+     * The amount and content of these notifications depends on the current trace configuration.
+     * If trace is 'off', the server should not send any logTrace notification.
+     * If trace is 'messages', the server should not add the 'verbose' field in the LogTraceParams.
      * <p>
      * $/logTrace should be used for systematic trace reporting. For single debugging messages, the
      * server should send window/logMessage notifications.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘$/logTrace’
-     * params: LogTraceParams defined as follows:
      */
     @JsonNotification
     void logTrace(LogTraceParams params);
+
     // region Window
 
     /**
-     * ShowMessage Notification (:arrow_left:)
      * The show message notification is sent from a server to a client to ask the client to display
      * a particular message in the user interface.
-     * <p>
-     * Notification:
-     * <p>
-     * method: ‘window/showMessage’
-     * params: ShowMessageParams defined as follows:
      */
-    @JsonNotification("sm")
+    @JsonNotification("showMessage")
     void showMessage(ShowMessageParams params);
 
-
-
     /**
-     * ShowMessage Request (:arrow_right_hook:)
      * The show message request is sent from a server to a client to ask the client to display a
      * particular message in the user interface. In addition to the show message notification the
      * request allows to pass actions and to wait for an answer from the client.
      */
     @JsonRequest
     @Nullable
-    CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params);
+    CompletableFuture<MessageActionItem> showMessageWithActions(ShowMessageRequestParams params);
 
 
     /**
-     * Show Document Request (:arrow_right_hook:)
-     * New in version 3.16.0
-     * <p>
      * The show document request is sent from a server to a client to ask the client to display a
      * particular resource referenced by a URI in the user interface.
-     * <p>
-     * property path (optional): window.showDocument
-     * property type: ShowDocumentClientCapabilities defined as follows:
      */
     @JsonRequest
     CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams params);
 
 
+    /**
+     * Notifiation about the finishing of a task.
+     *
+     * @param info task information
+     */
     @JsonNotification
-    void taskFinished(org.keyproject.key.api.data.TaskFinishedInfo info);
+    void taskFinished(TaskFinishedInfo info);
 
+    /**
+     * Progress on the current task running
+     *
+     * @param position some integer
+     * @TODO weigl: This call is stupid w/o information of the task assigned.
+     * we also should send max value for showing a progress indicator,
+     * and a message.
+     */
     @JsonNotification
     void taskProgress(int position);
 
+    /**
+     * This call notifies the client that a task has been started.
+     * Task are started, mainly triggered by the client, for various reason, e.g.,
+     * letting the macro run.
+     *
+     * @param info information about the task
+     */
     @JsonNotification
-    void taskStarted(org.keyproject.key.api.data.TaskStartedInfo info);
+    void taskStarted(TaskStartedInfo info);
     // endregion
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
index a399c097d2a..1fdf872b84d 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -3,15 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
-record LogMessageParams(
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type,
-
-        /**
-         * The actual message
-         */
-        String message) {
+/**
+ * @param type The message type. See {@link MessageType}
+ * @param message the actual message
+ */
+public record LogMessageParams(MessageType type, String message) {
 
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
index a9f9bde6315..1a884c04c1e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -5,16 +5,8 @@
 
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
 
-public record LogTraceParams(
-        /**
-         * The message to be logged.
-         */
-        @NonNull String messag,
-
-        /**
-         * Additional information that can be computed if the `trace` configuration
-         * is set to `'verbose'`
-         */
-        String verbose) {
-
-}
+/**
+ * @param message The message to be logged.
+ * @param level   Additional information that can be computed if the `trace` configuration is set to `'verbose'`
+ */
+public record LogTraceParams(@NonNull String message, String level) {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
index e6948bf3dec..c541125670e 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
-public record MessageActionItem(
-        /**
-         * A short title like 'Retry', 'Open Log' etc.
-         */
-        String title) {
+/**
+ * @param title A short title like 'Retry', 'Open Log' etc.
+ */
+public record MessageActionItem(String title) {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index b1f2e1ce5d4..e15b48085f8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -8,6 +8,8 @@
 import org.keyproject.key.api.data.TextRange;
 
 /**
+ * Information to show a document on the client side.
+ *
  * @param uri       The uri to show.
  * @param external  Indicates to show the resource in an external program.
  *                  To show, for example, `https://code.visualstudio.com/`
@@ -21,7 +23,6 @@
  *                  external program is started or the file is not a text
  *                  file.
  */
-
 public record ShowDocumentParams(
         String uri,
         boolean external,
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
index 616a0332897..925d94d96fb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -3,10 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
-public record ShowDocumentResult(
-        /**
-         * A boolean indicating if the show was successful.
-         */
-        boolean success) {
-
-}
+/**
+ * @param success A boolean indicating if the show was successful.
+ */
+public record ShowDocumentResult(boolean success) {}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
index 5b0a6fc0286..cdf2f3d2280 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -3,15 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
-public record ShowMessageParams(
-        /**
-         * The message type. See {@link MessageType}.
-         */
-        MessageType type,
-
-        /**
-         * The actual message.
-         */
-        String message) {
-
+/**
+ * @param type    The message type. See {@link MessageType}.
+ * @param message the actual message
+ */
+public record ShowMessageParams(MessageType type, String message) {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 3341b146701..5c7f17d9f18 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -5,20 +5,10 @@
 
 import java.util.List;
 
+/**
+ * @param type    The message type. See {@link MessageType}.
+ * @param message the actual message
+ */
 public record ShowMessageRequestParams(
-        /**
-         * The message type. See {@link MessageType}
-         */
-        MessageType type,
-
-        /**
-         * The actual message
-         */
-        String message,
-
-        /**
-         * The message action items to present.
-         *
-         */
-        List<MessageActionItem> actions) {
+        MessageType type, String message, List<MessageActionItem> actions) {
 }
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 14032a786fd..6ef38f569a1 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -6,17 +6,14 @@
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nullable;
 
+import org.jspecify.annotations.NullMarked;
 import org.keyproject.key.api.data.TaskFinishedInfo;
 import org.keyproject.key.api.data.TaskStartedInfo;
 import org.keyproject.key.api.remoteclient.*;
 
+@NullMarked
 class SimpleClient implements ClientApi {
 
-    @Override
-    public void sayHello(String e) {
-        System.out.format("Hello, %s%n", e);
-    }
-
     @Override
     public void logTrace(LogTraceParams params) {
 
@@ -29,7 +26,7 @@ public void showMessage(ShowMessageParams params) {
 
     @Nullable
     @Override
-    public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+    public CompletableFuture<MessageActionItem> showMessageWithActions(ShowMessageRequestParams params) {
         return null;
     }
 
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index 5abaa896762..cd023d4f8eb 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -23,6 +23,7 @@
 import edu.kit.iti.formal.keyextclientjava.rpc.RPCLayer;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.jspecify.annotations.NullMarked;
 import org.keyproject.key.api.KeyApiImpl;
 import org.keyproject.key.api.StartServer;
 import org.keyproject.key.api.data.KeyIdentifications;
@@ -35,6 +36,7 @@
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;
 
+@NullMarked
 public class MyKeyClient {
     public static final String JAR_FILE = "";
     private final ToolBar toolbar = new ToolBar();
@@ -115,12 +117,8 @@ private void openFile() {
         }
     }
 
+    @NullMarked
     private static class SimpleClient implements ClientApi {
-        @Override
-        public void sayHello(String e) {
-
-        }
-
         @Override
         public void logTrace(LogTraceParams params) {
 
@@ -132,7 +130,7 @@ public void showMessage(ShowMessageParams params) {
         }
 
         @Override
-        public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+        public CompletableFuture<MessageActionItem> showMessageWithActions(ShowMessageRequestParams params) {
             return null;
         }
 

From d238fbc0191dd21d0a115206d30485c597288efd Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 30 Nov 2025 04:44:25 +0100
Subject: [PATCH 48/50] working on documentation, now with json examples

---
 .../main/java/de/uka/ilkd/key/core/Main.java  |  36 +++--
 .../java/de/uka/ilkd/key/gui/Example.java     |  58 ++++----
 .../de/uka/ilkd/key/gui/ExampleChooser.java   |  54 ++++---
 .../key/gui/actions/OpenExampleAction.java    |  14 +-
 .../key/gui/actions/RunAllProofsAction.java   |   2 +-
 .../org/key_project/key/api/doc/DocGen.java   |  33 +++--
 .../key/api/doc/ExtractMetaData.java          | 114 +++++++-------
 .../org/key_project/key/api/doc/Main.java     |   5 +-
 .../key_project/key/api/doc/Metamodel.java    |  43 +++---
 .../key/api/doc/PythonGenerator.java          |   2 +-
 .../src/main/resources/templates/docs.ftl     |   9 ++
 .../org/keyproject/key/api/KeyApiImpl.java    |  46 +++---
 .../org/keyproject/key/api/NodeTextId.java    |   4 -
 .../keyproject/key/api/data/ContractDesc.java |  12 +-
 .../keyproject/key/api/data/DataExamples.java | 140 ++++++++++++++++++
 .../keyproject/key/api/data/ExampleDesc.java  |   5 +
 .../keyproject/key/api/data/FunctionDesc.java |   2 +-
 .../key/api/data/KeyIdentifications.java      |   5 +-
 .../keyproject/key/api/data/LoadParams.java   |  20 +--
 .../key/api/data/MacroDescription.java        |   1 +
 .../org/keyproject/key/api/data/NodeDesc.java |   3 +-
 .../keyproject/key/api/data/NodeTextDesc.java |   8 +-
 .../keyproject/key/api/data/ProofStatus.java  |   8 +
 .../key/api/data/TaskFinishedInfo.java        |   3 +-
 .../key/api/data/TaskStartedInfo.java         |   3 +-
 .../key/api/data/TermActionDesc.java          |  20 +--
 .../key/api/data/TermActionKind.java          |  19 ++-
 .../keyproject/key/api/data/TextRange.java    |   5 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |   2 +-
 .../java/org/keyproject/key/api/data/Uri.java |  50 +++++++
 .../keyproject/key/api/remoteapi/EnvApi.java  |  39 +++++
 .../key/api/remoteapi/ExampleApi.java         |  21 +++
 .../keyproject/key/api/remoteapi/GoalApi.java |  40 ++++-
 .../keyproject/key/api/remoteapi/KeyApi.java  |  11 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |  14 ++
 .../key/api/remoteapi/ProofApi.java           |  81 +++++++++-
 .../key/api/remoteapi/ProofLoadApi.java       |  15 +-
 .../key/api/remoteapi/ProofTreeApi.java       |  21 +++
 .../key/api/remoteclient/ClientApi.java       |   7 +-
 .../key/api/remoteclient/LogTraceParams.java  |   6 +-
 .../api/remoteclient/ShowDocumentParams.java  |  21 ++-
 .../api/remoteclient/ShowDocumentResult.java  |   3 +-
 .../api/remoteclient/ShowMessageParams.java   |   2 +-
 .../ShowMessageRequestParams.java             |   2 +-
 .../org/keyproject/key/api/SimpleClient.java  |   3 +-
 .../formal/keyextclientjava/MyKeyClient.java  |  11 +-
 46 files changed, 733 insertions(+), 290 deletions(-)
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/Uri.java

diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java b/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java
index dc9ffcc611e..a3c0b134658 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java
@@ -464,25 +464,27 @@ private AbstractMediatorUserInterfaceControl createUserInterface(List<Path> file
     }
 
     public static void ensureExamplesAvailable() {
-        File examplesDir = getExamplesDir() == null ? ExampleChooser.lookForExamples()
-                : new File(getExamplesDir());
-        if (!examplesDir.exists()) {
+        Path examplesDir = getExamplesDir() == null
+                ? ExampleChooser.lookForExamples()
+                : getExamplesDir();
+
+        if (!Files.exists(examplesDir)) {
             examplesDir = setupExamples();
         }
-        setExamplesDir(examplesDir.getAbsolutePath());
+        setExamplesDir(examplesDir.toAbsolutePath());
     }
 
-    private static File setupExamples() {
+    private static Path setupExamples() {
         try {
             URL examplesURL = Main.class.getResource("/examples.zip");
             if (examplesURL == null) {
                 throw new IOException("Missing examples.zip in resources");
             }
 
-            File tempDir = createTempDirectory();
+            Path tempDir = createTempDirectory();
 
             if (tempDir != null) {
-                IOUtil.extractZip(examplesURL.openStream(), tempDir.toPath());
+                IOUtil.extractZip(examplesURL.openStream(), tempDir);
             }
             return tempDir;
         } catch (IOException e) {
@@ -491,13 +493,9 @@ private static File setupExamples() {
         }
     }
 
-    private static File createTempDirectory() throws IOException {
-        final File tempDir = File.createTempFile("keyheap-examples-", null);
-        tempDir.delete();
-        if (!tempDir.mkdir()) {
-            return null;
-        }
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> IOUtil.delete(tempDir)));
+    private static Path createTempDirectory() throws IOException {
+        Path tempDir = Files.createTempDirectory("keyheap-examples-");
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> IOUtil.delete(tempDir.toFile())));
         return tempDir;
     }
 
@@ -541,7 +539,7 @@ private void preProcessInput()
         }
 
         if (inputFiles != null && !inputFiles.isEmpty()) {
-            Path f = inputFiles.get(0);
+            Path f = inputFiles.getFirst();
             if (Files.isDirectory(f)) {
                 workingDir = f;
             } else {
@@ -552,20 +550,20 @@ private void preProcessInput()
         }
     }
 
-    private static String EXAMPLE_DIR = null;
+    private static Path EXAMPLE_DIR = null;
 
-    public static @Nullable String getExamplesDir() {
+    public static @Nullable Path getExamplesDir() {
         return EXAMPLE_DIR;
     }
 
     /**
-     * Defines the examples directory. This method is used by the Eclipse
+     * Defines the examples' directory. This method is used by the Eclipse
      * integration (KeY4Eclipse)
      * to use the examples extract from the plug-in into the workspace.
      *
      * @param newExamplesDir The new examples directory to use.
      */
-    public static void setExamplesDir(String newExamplesDir) {
+    public static void setExamplesDir(Path newExamplesDir) {
         EXAMPLE_DIR = newExamplesDir;
     }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
index 3d9c18f83f7..f93329cbe06 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/Example.java
@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package de.uka.ilkd.key.gui;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -74,59 +73,59 @@ public class Example {
      */
     public static final String EXPORT_FILE_PREFIX = "example.exportFile.";
 
-    public final File exampleFile;
-    public final File directory;
+    public final Path exampleFile;
+    public final Path directory;
     public final String description;
     public final Properties properties;
 
-    public Example(File file) throws IOException {
+    public Example(Path file) throws IOException {
         this.exampleFile = file;
-        this.directory = file.getParentFile();
+        this.directory = file.getParent();
         this.properties = new Properties();
         StringBuilder sb = new StringBuilder();
         extractDescription(file, sb, properties);
         this.description = sb.toString();
     }
 
-    public File getDirectory() {
+    public Path getDirectory() {
         return directory;
     }
 
-    public File getProofFile() {
-        return new File(directory, properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
+    public Path getProofFile() {
+        return directory.resolve(properties.getProperty(KEY_PROOF_FILE, PROOF_FILE_NAME));
     }
 
-    public File getObligationFile() {
-        return new File(directory, properties.getProperty(KEY_FILE, KEY_FILE_NAME));
+    public Path getObligationFile() {
+        return directory.resolve(properties.getProperty(KEY_FILE, KEY_FILE_NAME));
     }
 
     public String getName() {
-        return properties.getProperty(KEY_NAME, directory.getName());
+        return properties.getProperty(KEY_NAME, directory.getFileName().toString());
     }
 
     public String getDescription() {
         return description;
     }
 
-    public File getExampleFile() {
+    public Path getExampleFile() {
         return exampleFile;
     }
 
-    public List<File> getAdditionalFiles() {
-        var result = new ArrayList<File>();
+    public List<Path> getAdditionalFiles() {
+        var result = new ArrayList<Path>();
         int i = 1;
         while (properties.containsKey(ADDITIONAL_FILE_PREFIX + i)) {
-            result.add(new File(directory, properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
+            result.add(directory.resolve(properties.getProperty(ADDITIONAL_FILE_PREFIX + i)));
             i++;
         }
         return result;
     }
 
-    public List<File> getExportFiles() {
-        ArrayList<File> result = new ArrayList<>();
+    public List<Path> getExportFiles() {
+        var result = new ArrayList<Path>();
         int i = 1;
         while (properties.containsKey(EXPORT_FILE_PREFIX + i)) {
-            result.add(new File(directory, properties.getProperty(EXPORT_FILE_PREFIX + i)));
+            result.add(directory.resolve(properties.getProperty(EXPORT_FILE_PREFIX + i)));
             i++;
         }
         return result;
@@ -169,24 +168,23 @@ public boolean hasProof() {
         return properties.containsKey(KEY_PROOF_FILE);
     }
 
-    private static StringBuilder extractDescription(File file, StringBuilder sb,
+    private static StringBuilder extractDescription(Path file, StringBuilder sb,
             Properties properties) {
-        try (BufferedReader r = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
-            String line;
+        try {
             boolean emptyLineSeen = false;
-            while ((line = r.readLine()) != null) {
+            for (var line : Files.readAllLines(file, StandardCharsets.UTF_8)) {
                 if (emptyLineSeen) {
                     sb.append(line).append("\n");
                 } else {
                     String trimmed = line.trim();
-                    if (trimmed.length() == 0) {
+                    if (trimmed.isEmpty()) {
                         emptyLineSeen = true;
-                    } else if (trimmed.startsWith("#")) {
-                        // ignore
                     } else {
-                        String[] entry = trimmed.split(" *[:=] *", 2);
-                        if (entry.length > 1) {
-                            properties.put(entry[0], entry[1]);
+                        if (!trimmed.startsWith("#")) {
+                            String[] entry = trimmed.split(" *[:=] *", 2);
+                            if (entry.length > 1) {
+                                properties.put(entry[0], entry[1]);
+                            }
                         }
                     }
                 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
index 4df6d2a0c39..21bf9149322 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ExampleChooser.java
@@ -6,12 +6,12 @@
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
@@ -26,6 +26,7 @@
 
 import org.key_project.util.java.IOUtil;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,7 +62,7 @@ public final class ExampleChooser extends JDialog {
     /**
      * The result value of the dialog. <code>null</code> if nothing to be loaded
      */
-    private File fileToLoad = null;
+    private Path fileToLoad = null;
 
     /**
      * The currently selected example. <code>null</code> if none selected
@@ -69,15 +70,13 @@ public final class ExampleChooser extends JDialog {
     private Example selectedExample;
 
 
-
     // -------------------------------------------------------------------------
     // constructors
     // -------------------------------------------------------------------------
 
-    private ExampleChooser(File examplesDir) {
+    private ExampleChooser(Path examplesDir) {
         super(MainWindow.getInstance(), "Load Example", true);
         assert examplesDir != null;
-        assert examplesDir.isDirectory();
 
         // create list panel
         final JPanel listPanel = new JPanel();
@@ -190,10 +189,10 @@ public void mouseClicked(MouseEvent e) {
     // internal methods
     // -------------------------------------------------------------------------
 
-    public static File lookForExamples() {
+    public static Path lookForExamples() {
         // weigl: using java properties: -Dkey.examples.dir="..."
         if (System.getProperty(KEY_EXAMPLE_DIR) != null) {
-            return new File(System.getProperty(KEY_EXAMPLE_DIR));
+            return Paths.get(System.getProperty(KEY_EXAMPLE_DIR));
         }
 
         // greatly simplified version without parent path lookup.
@@ -201,12 +200,12 @@ public static File lookForExamples() {
         if (!folder.exists()) {
             folder = new File(IOUtil.getClassLocation(ExampleChooser.class), EXAMPLES_PATH);
         }
-        return folder;
+        return folder.toPath();
     }
 
-    private static String fileAsString(File f) {
+    private static String fileAsString(Path f) {
         try {
-            return IOUtil.readFrom(f);
+            return Files.readString(f);
         } catch (IOException e) {
             LOGGER.error("Could not read file '{}'", f, e);
             return "<Error reading file: " + f + ">";
@@ -214,7 +213,6 @@ private static String fileAsString(File f) {
     }
 
 
-
     private void updateDescription() {
 
         TreePath selectionPath = exampleList.getSelectionModel().getSelectionPath();
@@ -235,8 +233,8 @@ private void updateDescription() {
                 if (p >= 0) {
                     addTab(fileAsString.substring(p), "Proof Obligation", false);
                 }
-                for (File file : example.getAdditionalFiles()) {
-                    addTab(fileAsString(file), file.getName(), false);
+                for (Path file : example.getAdditionalFiles()) {
+                    addTab(fileAsString(file), file.getFileName().toString(), false);
                 }
                 loadButton.setEnabled(true);
                 loadProofButton.setEnabled(example.hasProof());
@@ -268,16 +266,16 @@ private void addTab(String string, String name, boolean wrap) {
      * Shows the dialog, using the passed examples directory. If null is passed, tries to find
      * examples directory on its own.
      */
-    public static File showInstance(String examplesDirString) {
+    public static @Nullable Path showInstance(Path examplesDirString) {
         // get examples directory
-        File examplesDir;
+        Path examplesDir;
         if (examplesDirString == null) {
             examplesDir = lookForExamples();
         } else {
-            examplesDir = new File(examplesDirString);
+            examplesDir = examplesDirString;
         }
 
-        if (!examplesDir.isDirectory()) {
+        if (!Files.isDirectory(examplesDir)) {
             JOptionPane.showMessageDialog(MainWindow.getInstance(),
                 "The examples directory cannot be found.\n" + "Please install them at "
                     + (examplesDirString == null ? IOUtil.getProjectRoot(ExampleChooser.class) + "/"
@@ -304,19 +302,17 @@ public static File showInstance(String examplesDirString) {
      * @param examplesDir The examples directory to list examples in.
      * @return The found examples.
      */
-    public static List<Example> listExamples(File examplesDir) {
-        List<Example> result = new LinkedList<>();
-
-        String line;
-        final File index = new File(new File(examplesDir, "index"), "samplesIndex.txt");
-        try (BufferedReader br =
-            new BufferedReader(new FileReader(index, StandardCharsets.UTF_8))) {
-            while ((line = br.readLine()) != null) {
+    public static List<Example> listExamples(Path examplesDir) {
+        List<Example> result = new ArrayList<>(64);
+
+        final Path index = examplesDir.resolve("index").resolve("samplesIndex.txt");
+        try {
+            for (var line : Files.readAllLines(index)) {
                 line = line.trim();
                 if (line.startsWith("#") || line.isEmpty()) {
                     continue;
                 }
-                File f = new File(examplesDir, line);
+                Path f = examplesDir.resolve(line);
                 try {
                     result.add(new Example(f));
                 } catch (IOException e) {
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java
index a630237bd5f..49265a1dcb5 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java
@@ -4,7 +4,7 @@
 package de.uka.ilkd.key.gui.actions;
 
 import java.awt.event.ActionEvent;
-import java.io.File;
+import java.nio.file.Path;
 
 import de.uka.ilkd.key.core.Main;
 import de.uka.ilkd.key.gui.ExampleChooser;
@@ -16,12 +16,6 @@
  * Opens a file dialog allowing to select the example to be loaded
  */
 public final class OpenExampleAction extends MainWindowAction {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -7703620988220254791L;
-
     public OpenExampleAction(MainWindow mainWindow) {
         super(mainWindow);
         setName("Load Example...");
@@ -30,10 +24,10 @@ public OpenExampleAction(MainWindow mainWindow) {
     }
 
     public void actionPerformed(ActionEvent e) {
-        File file = ExampleChooser.showInstance(Main.getExamplesDir());
+        Path file = ExampleChooser.showInstance(Main.getExamplesDir());
         if (file != null) {
-            KeYFileChooser.getFileChooser("Select file to load").setSelectedFile(file);
-            mainWindow.loadProblem(file.toPath());
+            KeYFileChooser.getFileChooser("Select file to load").setSelectedFile(file.toFile());
+            mainWindow.loadProblem(file);
         }
     }
 }
diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
index 798ce7bcdbd..62a52707985 100644
--- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
+++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java
@@ -100,7 +100,7 @@ public RunAllProofsAction(MainWindow mainWindow) {
         super(mainWindow);
 
         Main.ensureExamplesAvailable();
-        exampleDir = Paths.get(Main.getExamplesDir());
+        exampleDir = Main.getExamplesDir();
 
         try {
             files = loadFiles();
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index 32acdf9a71b..4e66c3b8054 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -3,11 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.key.api.doc;
 
-import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
-import freemarker.template.Configuration;
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.TemplateException;
-
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Comparator;
@@ -15,6 +10,13 @@
 import java.util.TreeMap;
 import java.util.function.Supplier;
 
+import freemarker.core.HTMLOutputFormat;
+import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
+import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateExceptionHandler;
+
 /**
  * Generation of Markdown documentation.
  *
@@ -31,22 +33,23 @@ public DocGen(Metamodel.KeyApi metamodel) {
     @Override
     public String get() {
         final StringWriter target = new StringWriter();
-        try  {
+        try {
             // 1) Configure FreeMarker
             var cfg = new Configuration(Configuration.VERSION_2_3_32);
             cfg.setClassForTemplateLoading(DocGen.class, "/templates"); // classpath
             cfg.setDefaultEncoding("UTF-8");
-            //cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+            cfg.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
             cfg.setLogTemplateExceptions(false);
             cfg.setWrapUncheckedExceptions(true);
             cfg.setFallbackOnNullLoopVariable(false);
-            //cfg.setOutputFormat(HTMLOutputFormat.INSTANCE);
+            cfg.setOutputFormat(HTMLOutputFormat.INSTANCE);
 
             // Use DefaultObjectWrapper to expose fields of objects in the data model
             DefaultObjectWrapper wrapper = new DefaultObjectWrapper(Configuration.VERSION_2_3_32);
             wrapper.setExposeFields(true);
             wrapper.setMethodsShadowItems(true);
-            wrapper.setRecordZeroArgumentNonVoidMethodPolicy(ZeroArgumentNonVoidMethodPolicy.BOTH_METHOD_AND_PROPERTY_UNLESS_BEAN_PROPERTY_READ_METHOD);
+            wrapper.setRecordZeroArgumentNonVoidMethodPolicy(
+                ZeroArgumentNonVoidMethodPolicy.BOTH_METHOD_AND_PROPERTY_UNLESS_BEAN_PROPERTY_READ_METHOD);
             wrapper.setForceLegacyNonListCollections(false);
             wrapper.setDefaultDateType(freemarker.template.TemplateDateModel.DATETIME);
             cfg.setObjectWrapper(wrapper);
@@ -57,14 +60,14 @@ public String get() {
             model.put("segmentDocumentation", metamodel.segmentDocumentation());
 
             model.put("endpoints",
-                    metamodel.endpoints()
-                            .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
-                            .toList());
+                metamodel.endpoints()
+                        .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                        .toList());
 
             model.put("types",
-                    metamodel.types().values()
-                            .stream().sorted(Comparator.comparing(Metamodel.Type::name))
-                            .toList());
+                metamodel.types().values()
+                        .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                        .toList());
 
 
             // 3) Get template
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
index 0ba6ad8a121..4140b1ecfeb 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/ExtractMetaData.java
@@ -2,30 +2,32 @@
  * KeY is licensed under the GNU General Public License Version 2
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.key.api.doc;/*
- * This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version
- * 2
- * SPDX-License-Identifier: GPL-2.0-only
- */
+                                     * This file is part of KeY - https://key-project.org
+                                     * KeY is licensed under the GNU General Public License Version
+                                     * 2
+                                     * SPDX-License-Identifier: GPL-2.0-only
+                                     */
+
+import java.io.File;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
 
-import com.github.therapi.runtimejavadoc.*;
 import de.uka.ilkd.key.proof.Proof;
+
+import org.key_project.key.api.doc.Metamodel.HelpText;
+import org.key_project.key.api.doc.Metamodel.HelpTextEntry;
+
+import com.github.therapi.runtimejavadoc.*;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.jspecify.annotations.Nullable;
-import org.key_project.key.api.doc.Metamodel.HelpText;
-import org.key_project.key.api.doc.Metamodel.HelpTextEntry;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
-import java.io.File;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
-
 /**
  * @author Alexander Weigl
  * @version 1 (14.10.23)
@@ -35,7 +37,8 @@ public class ExtractMetaData implements Runnable {
     private final List<Metamodel.Endpoint> endpoints = new LinkedList<>();
     private final Map<Class<?>, Metamodel.Type> types = new HashMap<>();
     private final Map<String, HelpText> segDocumentation = new TreeMap<>();
-    private final Metamodel.KeyApi keyApi = new Metamodel.KeyApi(endpoints, types, segDocumentation);
+    private final Metamodel.KeyApi keyApi =
+        new Metamodel.KeyApi(endpoints, types, segDocumentation);
 
     public ExtractMetaData() {
     }
@@ -96,26 +99,27 @@ private void addServerEndpoint(Method method) {
         }
 
         throw new IllegalStateException(
-                "Method " + method + " is neither a request nor a notification");
+            "Method " + method + " is neither a request nor a notification");
     }
 
     private @Nullable HelpText findDocumentation(Method method) {
         MethodJavadoc javadoc = RuntimeJavadoc.getJavadoc(method);
-        if (javadoc.isEmpty()) return null;
+        if (javadoc.isEmpty())
+            return null;
 
         final var visitor = new ToHtmlStringCommentVisitor();
         javadoc.getComment().visit(visitor);
 
-        var t = javadoc.getThrows().stream().map(it ->
-                new HelpTextEntry(it.getName(), it.getComment().toString()));
+        var t = javadoc.getThrows().stream()
+                .map(it -> new HelpTextEntry(it.getName(), it.getComment().toString()));
 
-        var p = javadoc.getParams().stream().map(it ->
-                new HelpTextEntry(it.getName(), it.getComment().toString()));
+        var p = javadoc.getParams().stream()
+                .map(it -> new HelpTextEntry(it.getName(), it.getComment().toString()));
 
         var r = Stream.of(new HelpTextEntry("returns", javadoc.getReturns().toString()));
 
         return new HelpText(visitor.build(),
-                Stream.concat(r, Stream.concat(p, t)).toList());
+            Stream.concat(r, Stream.concat(p, t)).toList());
     }
 
     private List<Metamodel.Argument> translate(Parameter[] parameters) {
@@ -171,7 +175,8 @@ private Metamodel.Type getOrFindType(Class<?> type) {
 
 
         var t = types.get(type);
-        if (t != null) return t;
+        if (t != null)
+            return t;
         var a = createType(type);
         types.put(type, a);
         return a;
@@ -181,23 +186,21 @@ private Metamodel.Type createType(Class<?> type) {
         final var documentation = findDocumentation(type);
         if (type.isEnum()) {
             return new Metamodel.EnumType(type.getSimpleName(), type.getName(),
-                    Arrays.stream(type.getEnumConstants())
-                            .map(
-                                    it ->
-                                            new Metamodel.EnumConstant(it.toString(),
-                                                    findDocumentationEnum(type, it)))
-                            .toList(),
-                    documentation);
+                Arrays.stream(type.getEnumConstants())
+                        .map(
+                            it -> new Metamodel.EnumConstant(it.toString(),
+                                findDocumentationEnum(type, it)))
+                        .toList(),
+                documentation);
         }
 
         var obj = new Metamodel.ObjectType(type.getSimpleName(), type.getName(), new ArrayList<>(),
-                documentation);
+            documentation);
         final var list = Arrays.stream(type.getDeclaredFields())
-                .map(it ->
-                        new Metamodel.Field(it.getName(), getOrFindTypeName(it.getGenericType()),
-                                type.isRecord()
-                                        ? findDocumentationRecord(type, it.getName())
-                                        : findDocumentation(it)))
+                .map(it -> new Metamodel.Field(it.getName(), getOrFindTypeName(it.getGenericType()),
+                    type.isRecord()
+                            ? findDocumentationRecord(type, it.getName())
+                            : findDocumentation(it)))
                 .toList();
         obj.fields().addAll(list);
         return obj;
@@ -205,13 +208,15 @@ private Metamodel.Type createType(Class<?> type) {
 
     private @Nullable HelpText findDocumentation(Field it) {
         var javadoc = RuntimeJavadoc.getJavadoc(it);
-        if (javadoc.isEmpty()) return null;
+        if (javadoc.isEmpty())
+            return null;
         return printFieldDocumentation(javadoc);
     }
 
     private @Nullable HelpText findDocumentationEnum(Class<?> type, Object enumConstant) {
         ClassJavadoc javadoc = RuntimeJavadoc.getJavadoc(type);
-        if (javadoc.isEmpty()) return null;
+        if (javadoc.isEmpty())
+            return null;
         for (var cdoc : javadoc.getEnumConstants()) {
             if (cdoc.getName().equalsIgnoreCase(enumConstant.toString())) {
                 return printFieldDocumentation(cdoc);
@@ -222,7 +227,8 @@ private Metamodel.Type createType(Class<?> type) {
 
     private @Nullable HelpText findDocumentationRecord(Class<?> type, String name) {
         ClassJavadoc javadoc = RuntimeJavadoc.getJavadoc(type);
-        if (javadoc.isEmpty()) return null;
+        if (javadoc.isEmpty())
+            return null;
         for (var cdoc : javadoc.getRecordComponents()) {
             if (cdoc.getName().equalsIgnoreCase(name)) {
                 return new HelpText(cdoc.getComment().toString(), List.of());
@@ -235,11 +241,11 @@ private static HelpText printFieldDocumentation(FieldJavadoc javadoc) {
         final var visitor = new ToHtmlStringCommentVisitor();
         javadoc.getComment().visit(visitor);
 
-        var t = javadoc.getOther().stream().map(it ->
-                new HelpTextEntry(it.getName(), it.getComment().toString()));
+        var t = javadoc.getOther().stream()
+                .map(it -> new HelpTextEntry(it.getName(), it.getComment().toString()));
 
-        var p = javadoc.getSeeAlso().stream().map(it ->
-                new HelpTextEntry(it.getSeeAlsoType().toString(), it.getStringLiteral()));
+        var p = javadoc.getSeeAlso().stream().map(
+            it -> new HelpTextEntry(it.getSeeAlsoType().toString(), it.getStringLiteral()));
 
         return new HelpText(visitor.build(), Stream.concat(p, t).toList());
     }
@@ -249,14 +255,14 @@ private static HelpText printFieldDocumentation(FieldJavadoc javadoc) {
         if (!classDoc.isEmpty()) { // optionally skip absent documentation
             var other = classDoc.getOther()
                     .stream().map(it -> new HelpTextEntry(it.getName(),
-                            it.getComment().toString()));
+                        it.getComment().toString()));
             var also = classDoc.getSeeAlso()
                     .stream().map(it -> new HelpTextEntry(it.getSeeAlsoType().toString(),
-                            it.getStringLiteral()));
+                        it.getStringLiteral()));
 
             return new HelpText(
-                    classDoc.getComment().toString(),
-                    Stream.concat(other, also).toList());
+                classDoc.getComment().toString(),
+                Stream.concat(other, also).toList());
         }
         return null;
     }
@@ -289,8 +295,8 @@ private void addClientEndpoint(Method method) {
     }
 
     private static String callMethodName(String method, String segment,
-                                         @Nullable String userValue,
-                                         boolean useSegment) {
+            @Nullable String userValue,
+            boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
                 return method;
@@ -315,7 +321,7 @@ private String getOrFindTypeName(Type type) {
             }
             case ParameterizedType pt -> {
                 if (Objects.equals(pt.getRawType().getTypeName(),
-                        CompletableFuture.class.getTypeName())) {
+                    CompletableFuture.class.getTypeName())) {
                     return getOrFindTypeName(pt.getActualTypeArguments()[0]);
                 }
                 if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
@@ -339,7 +345,8 @@ private String getOrFindTypeName(Type type) {
     private String getOrFindTypeName(Class<?> type) {
         var t = types.get(type);
 
-        if (t != null) return t.name();
+        if (t != null)
+            return t.name();
         else if (type == String.class)
             return Metamodel.BuiltinType.STRING.name();
         else if (type == Integer.class)
@@ -380,13 +387,14 @@ else if (type == CompletableFuture.class) {
 
     private Metamodel.@Nullable Type getOrFindType(Type genericReturnType) {
         switch (genericReturnType) {
-            case GenericArrayType a -> throw new RuntimeException("Unwanted type found: " + genericReturnType);
+            case GenericArrayType a ->
+                throw new RuntimeException("Unwanted type found: " + genericReturnType);
             case Class<?> c -> {
                 return getOrFindType(c);
             }
             case ParameterizedType pt -> {
                 if (Objects.equals(pt.getRawType().getTypeName(),
-                        CompletableFuture.class.getTypeName())) {
+                    CompletableFuture.class.getTypeName())) {
                     return getOrFindType(pt.getActualTypeArguments()[0]);
                 }
                 if (Objects.equals(pt.getRawType().getTypeName(), List.class.getTypeName())) {
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
index 943c7849a72..72544b5f375 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java
@@ -7,7 +7,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -31,8 +30,8 @@
     version = "gendoc 1.0",
     description = "Generates the documentation for key.api")
 public class Main implements Callable<Integer> {
-    @CommandLine.Option(names = {"-s", "--source"},
-            description = "Source folder for getting JavaDoc")
+    @CommandLine.Option(names = { "-s", "--source" },
+        description = "Source folder for getting JavaDoc")
     private @Nullable Path source = Paths.get("keyext.api", "src", "main", "java");
 
     @CommandLine.Option(names = { "-o", "--output" }, description = "Output folder")
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
index 51116f829da..464249b47da 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/Metamodel.java
@@ -8,6 +8,7 @@
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import org.keyproject.key.api.data.DataExamples;
 
 /// Metamodel of the API. This class contains classes which represents the functionality and
 /// interfaces of the API.
@@ -20,7 +21,7 @@ public class Metamodel {
     /// Root class of the metamodel.
     ///
     /// @param endpoints a list of provided services
-    /// @param types     a list of known types
+    /// @param types a list of known types
     public record KeyApi(
             List<Endpoint> endpoints,
             java.util.Map<Class<?>, Type> types,
@@ -42,7 +43,8 @@ public sealed interface Endpoint {
         String name();
 
         /// a markdown documentation
-        @Nullable HelpText documentation();
+        @Nullable
+        HelpText documentation();
 
         default String kind() {
             return getClass().getName();
@@ -85,23 +87,25 @@ public record Argument(String name, String type) {
     /// @param documentation
     /// @param returnType
     public record ServerRequest(String name, @Nullable HelpText documentation, List<Argument> args,
-                                Type returnType)
+            Type returnType)
             implements Endpoint {
     }
 
     ///
-    public record ServerNotification(String name, @Nullable HelpText documentation, List<Argument> args)
+    public record ServerNotification(String name, @Nullable HelpText documentation,
+            List<Argument> args)
             implements Endpoint {
     }
 
     ///
     public record ClientRequest(String name, @Nullable HelpText documentation, List<Argument> args,
-                                Type returnType)
+            Type returnType)
             implements Endpoint {
     }
 
     ///
-    public record ClientNotification(String name, @Nullable HelpText documentation, List<Argument> args)
+    public record ClientNotification(String name, @Nullable HelpText documentation,
+            List<Argument> args)
             implements Endpoint {
     }
 
@@ -119,14 +123,14 @@ default String kind() {
         }
 
         /// Documentation of the data type
-        @Nullable HelpText documentation();
+        @Nullable
+        HelpText documentation();
 
         /// name of the data type
         String name();
 
         ///
         String identifier();
-
     }
 
 
@@ -147,7 +151,7 @@ public String identifier() {
 
     /// List of `type`.
     ///
-    /// @param type          the type of list elements
+    /// @param type the type of list elements
     public record ListType(Type type) implements Type {
         @Override
         public String name() {
@@ -166,12 +170,12 @@ public String identifier() {
 
     /// Data type of objects or struct or record.
     ///
-    /// @param typeName      short type name
-    /// @param typeFullName  fully-qualified type name
-    /// @param fields        list of fields
+    /// @param typeName short type name
+    /// @param typeFullName fully-qualified type name
+    /// @param fields list of fields
     /// @param documentation documentation of data type
     public record ObjectType(String typeName, String typeFullName, List<Field> fields,
-                             HelpText documentation) implements Type {
+            HelpText documentation) implements Type {
         @Override
         public String name() {
             return typeName;
@@ -180,6 +184,11 @@ public String name() {
         public String identifier() {
             return typeFullName;
         }
+
+        ///
+        public @Nullable String jsonExample() {
+            return DataExamples.get(typeFullName);
+        }
     }
 
     /// A data type representing that a method returns or expecting either type `a` or `b`.
@@ -205,12 +214,12 @@ public String identifier() {
 
     /// Enumeration data type
     ///
-    /// @param typeName      short name of the data type
-    /// @param typeFullName  fully-qualified name
-    /// @param values        possible values of the enum
+    /// @param typeName short name of the data type
+    /// @param typeFullName fully-qualified name
+    /// @param values possible values of the enum
     /// @param documentation documentation of the data type
     public record EnumType(String typeName, String typeFullName, List<EnumConstant> values,
-                           HelpText documentation) implements Type {
+            HelpText documentation) implements Type {
 
         @Override
         public String name() {
diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index a4e44b60eb5..b9305fec135 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
@@ -70,7 +70,7 @@ protected Metamodel.Type findType(String typeName) {
                 })
                 .findFirst()
                 .orElse(new Metamodel.ObjectType("...", "...", List.of(), null));
-                        //new RuntimeException("Could not find type: " + typeName));
+        // new RuntimeException("Could not find type: " + typeName));
     }
 
 
diff --git a/keyext.api.doc/src/main/resources/templates/docs.ftl b/keyext.api.doc/src/main/resources/templates/docs.ftl
index 810e6fbebee..2103b5f798a 100644
--- a/keyext.api.doc/src/main/resources/templates/docs.ftl
+++ b/keyext.api.doc/src/main/resources/templates/docs.ftl
@@ -97,6 +97,15 @@
                     </#list>
                 </ul>
             </div>
+
+            <#if (type.jsonExample)??>
+                <div>
+                    <details>
+                        <summary>Example</summary>
+                        <code class="highlight" style="white-space: pre">${type.jsonExample}</code>
+                    </details>
+                </div>
+            </#if>
         </#if>
     </div>
 </#list>
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index 82298a5604b..6b03be709b1 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -51,10 +51,7 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
-import org.keyproject.key.api.data.NodeText;
-import org.keyproject.key.api.data.ExampleDesc;
 import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.data.PrintOptions;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
 import static de.uka.ilkd.key.proof.ProofNodeDescription.collectPathInformation;
@@ -239,19 +236,12 @@ public CompletableFuture<NodeDesc> tree(ProofId proofId) {
     private NodeDesc asNodeDescRecursive(ProofId proofId, Node root) {
         final List<NodeDesc> list =
             root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList();
-        return new NodeDesc(new NodeId(proofId, root.serialNr()),
+        return new NodeDesc(new NodeId(proofId, "" + root.serialNr()),
             root.getNodeInfo().getBranchLabel(),
             root.getNodeInfo().getScriptRuleApplication(),
             list, collectPathInformation(root));
     }
 
-    @Override
-    public CompletableFuture<NodeDesc> root(ProofId proofId) {
-        return CompletableFuture.supplyAsync(() -> {
-            var proof = data.find(proofId);
-            return asNodeDesc(proofId, proof.root());
-        });
-    }
 
     @Override
     public CompletableFuture<List<NodeDesc>> children(NodeId nodeId) {
@@ -282,6 +272,15 @@ public CompletableFuture<TreeNodeDesc> treeRoot(ProofId proof) {
             TreeNodeDesc.from(proof, data.find(proof).root()));
     }
 
+    @Override
+    public CompletableFuture<NodeDesc> root(ProofId proofId) {
+        return CompletableFuture.supplyAsync(() -> {
+            var proof = data.find(proofId);
+            return asNodeDesc(proofId, proof.root());
+        });
+    }
+
+
     @Override
     public CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId) {
         return null;
@@ -370,13 +369,13 @@ public CompletableFuture<NodeTextDesc> print(NodeId nodeId, PrintOptions options
     private final IdentitySequentPrintFilter filter = new IdentitySequentPrintFilter();
 
     @Override
-    public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int pos) {
+    public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int caretPos) {
         return CompletableFuture.supplyAsync(() -> {
             var node = data.find(printId.nodeId());
             var proof = data.find(printId.nodeId().proofId());
             var goal = proof.getOpenGoal(node);
             var nodeText = data.find(printId);
-            var pis = nodeText.table().getPosInSequent(pos, filter);
+            var pis = nodeText.table().getPosInSequent(caretPos, filter);
             return new TermActionUtil(printId, data.find(printId.nodeId().proofId().env()), pis,
                 goal)
                     .getActions();
@@ -385,8 +384,8 @@ public CompletableFuture<List<TermActionDesc>> actions(NodeTextId printId, int p
     }
 
     @Override
-    public CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id) {
-        return null;
+    public CompletableFuture<Boolean> applyAction(TermActionId id) {
+        return CompletableFuture.completedFuture(false);
     }
 
     @Override
@@ -401,17 +400,17 @@ public void setClientApi(ClientApi remoteProxy) {
     private final DefaultUserInterfaceControl control = new MyDefaultUserInterfaceControl();
 
     @Override
-    public CompletableFuture<ProofId> loadExample(String id) {
+    public CompletableFuture<ProofId> loadExample(String name) {
         return CompletableFutures.computeAsync((c) -> {
             var examples = ExampleChooser.listExamples(ExampleChooser.lookForExamples())
-                    .stream().filter(it -> it.getName().equals(id)).findFirst();
+                    .stream().filter(it -> it.getName().equals(name)).findFirst();
             if (examples.isPresent()) {
                 var ex = examples.get();
                 Proof proof = null;
                 KeYEnvironment<?> env = null;
                 try {
                     var loader = control.load(JavaProfile.getDefaultProfile(),
-                        ex.getObligationFile().toPath(),
+                        ex.getObligationFile(),
                         null, null, null, null, true, null);
                     InitConfig initConfig = loader.getInitConfig();
 
@@ -493,10 +492,13 @@ public CompletableFuture<Either<EnvironmentId, ProofId>> load(LoadParams params)
             KeYEnvironment<?> env;
             try {
                 var loader = control.load(JavaProfile.getDefaultProfile(),
-                    params.problemFile(),
-                    params.classPath(),
-                    params.bootClassPath(),
-                    params.includes(),
+                    params.problemFile() != null ? params.problemFile().asPath() : null,
+                    params.classPath() != null
+                            ? params.classPath().stream().map(Uri::asPath).toList()
+                            : null,
+                    params.bootClassPath() != null ? params.bootClassPath().asPath() : null,
+                    params.includes() != null ? params.includes().stream().map(Uri::asPath).toList()
+                            : null,
                     null,
                     true,
                     null);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
deleted file mode 100644
index 2f948413e72..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This file is part of KeY - https://key-project.org
- * KeY is licensed under the GNU General Public License Version 2
- * SPDX-License-Identifier: GPL-2.0-only */
-package org.keyproject.key.api;
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index d5070419f1c..16dac00a307 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -9,23 +9,25 @@
 /**
  * Description of a loadable contract in KeY.
  *
- * Contracts can be arbitrary objects, representing a functional, dependency, information flow, etc. contract.
+ * Contracts can be arbitrary objects, representing a functional, dependency, information flow, etc.
+ * contract.
  * Contracts can be loaded into proofs.
  *
  * @param contractId an identifier of the contract
  * @param name Name of the contract
  * @param displayName Showable name
- * @param typeName  the typename which is associated with this contract
- * @param htmlText  content of the contract as html text
+ * @param typeName the typename which is associated with this contract
+ * @param htmlText content of the contract as html text
  * @param plainText content of the contract as plain text
  *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 public record ContractDesc(KeyIdentifications.ContractId contractId, String name,
-        String displayName, String typeName, String htmlText, String plainText) implements KeYDataTransferObject {
+        String displayName, String typeName, String htmlText, String plainText)
+        implements KeYDataTransferObject {
     public static ContractDesc from(KeyIdentifications.EnvironmentId envId,
-                                    Services services, Contract it) {
+            Services services, Contract it) {
         return new ContractDesc(new KeyIdentifications.ContractId(envId, it.getName()),
             it.getName(), it.getDisplayName(), it.getTypeName(),
             it.getHTMLText(services), it.getPlainText(services));
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java b/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
new file mode 100644
index 00000000000..07771877d3f
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
@@ -0,0 +1,140 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+package org.keyproject.key.api.data;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.ExecutionException;
+
+import de.uka.ilkd.key.macros.FinishSymbolicExecutionMacro;
+import de.uka.ilkd.key.scripts.RuleCommand;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.jspecify.annotations.Nullable;
+import org.keyproject.key.api.KeyApiImpl;
+import org.keyproject.key.api.remoteapi.ServerManagement;
+import org.keyproject.key.api.remoteclient.ShowDocumentParams;
+import org.keyproject.key.api.remoteclient.ShowDocumentResult;
+
+public class DataExamples {
+    private final KeyApiImpl impl = new KeyApiImpl();
+    // private final KeyIdentifications.ProofId proof;
+
+    public DataExamples() throws ExecutionException, InterruptedException {
+        // var name = impl.examples().get().getFirst().name();
+        // proof = impl.loadExample(name).get();
+    }
+
+    private static @Nullable DataExamples instance;
+    private static final Map<String, String> cache = new TreeMap<>();
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+    public static @Nullable String get(String typeFullName) {
+        try {
+            if (cache.containsKey(typeFullName)) {
+                return cache.get(typeFullName);
+            }
+
+            if (instance == null) {
+                instance = new DataExamples();
+            }
+
+            var clazz = Class.forName(typeFullName);
+            for (var method : instance.getClass().getMethods()) {
+                if (method.getReturnType().equals(clazz)) {
+                    var object = method.invoke(instance);
+                    return gson.toJson(object);
+                }
+            }
+
+            return null;
+        } catch (ClassNotFoundException | ExecutionException | InterruptedException
+                | IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    /*
+     * public ExampleDesc getExample() {
+     * return ExampleChooser.listExamples(ExampleChooser.lookForExamples())
+     * .stream().map(ExampleDesc::from).findFirst().orElseThrow();
+     * }
+     */
+
+    public ServerManagement.SetTraceParams getTraceParams() {
+        return new ServerManagement.SetTraceParams(TraceValue.Info);
+    }
+
+    public ProofStatus getProofStatus() {
+        return new ProofStatus(getProofId(), 10, 23);
+    }
+
+    public KeyIdentifications.ProofId getProofId() {
+        return new KeyIdentifications.ProofId(getEnvId(), "proof-5");
+    }
+
+    public KeyIdentifications.EnvironmentId getEnvId() {
+        return new KeyIdentifications.EnvironmentId("env-1");
+    }
+
+    public ShowDocumentParams getSDP() {
+        return new ShowDocumentParams("", true, true, getTextRange());
+    }
+
+    public @Nullable TextRange getTextRange() {
+        return new TextRange(25, 100);
+    }
+
+    public ShowDocumentResult getSDR() {
+        return new ShowDocumentResult(true);
+    }
+
+    public TermActionDesc getTermActionDesc() {
+        return new TermActionDesc(getTermActionId(), "andLeft", "Apply taclet 'andLeft'.",
+            "rules", TermActionKind.Taclet);
+    }
+
+    private KeyIdentifications.TermActionId getTermActionId() {
+        return new KeyIdentifications.TermActionId(getNodeId(), "0.1.0", "taclet-andLeft-010");
+    }
+
+    private KeyIdentifications.NodeId getNodeId() {
+        return new KeyIdentifications.NodeId(getProofId(), "01010102");
+    }
+
+    public MacroDescription getMacroDescription() {
+        return MacroDescription.from(new FinishSymbolicExecutionMacro());
+    }
+
+    public PrintOptions getPrintingOptions() {
+        return new PrintOptions(true, 80, 4, true, false);
+    }
+
+    public ProofScriptCommandDesc getPSCDesc() throws ExecutionException, InterruptedException {
+        return ProofScriptCommandDesc.from(new RuleCommand());
+    }
+
+    /*
+     * public NodeTextDesc getNodeText() throws ExecutionException, InterruptedException {
+     * var root = impl.treeRoot(proof).get();
+     * return impl.print(root.id(), getPrintingOptions()).get();
+     * }
+     *
+     * public FunctionDesc getFunctionDescription() throws ExecutionException, InterruptedException
+     * {
+     * return impl.functions(proof.env()).get().getFirst();
+     * }
+     *
+     * public ProofScriptCommandDesc getPSCDesc() throws ExecutionException, InterruptedException {
+     * return impl.getAvailableScriptCommands().get().getFirst();
+     * }
+     *
+     * public SortDesc getSortDesc() throws ExecutionException, InterruptedException {
+     * return impl.sorts(proof.env()).get().getFirst();
+     * }
+     */
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
index 15b1bbf476e..0e3a53057c2 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ExampleDesc.java
@@ -6,6 +6,11 @@
 import de.uka.ilkd.key.gui.Example;
 
 /**
+ * This class represents a built-in example.
+ * TODO (weigl,rpc) Also deliver the contents of the example (files)?
+ *
+ * @param name the name of the example, also used as an identifer
+ * @param description a description of the example
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
index 8a3797093b3..c86e4a45179 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -13,7 +13,7 @@
  * @version 1 (15.10.23)
  */
 public record FunctionDesc(String name, String sort, SortDesc retSort,
-                           List<SortDesc> argSorts,
+        List<SortDesc> argSorts,
         boolean rigid,
         boolean unique, boolean skolemConstant) implements KeYDataTransferObject {
     public static FunctionDesc from(Function fn) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index a56deae1d29..0a8b67c2893 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -63,7 +63,8 @@ public void dispose(EnvironmentId id) {
 
     public Node find(NodeId nodeId) {
         Proof p = find(nodeId.proofId);
-        var opt = p.findAny(it -> it.serialNr() == nodeId.nodeId());
+        var id = Integer.parseInt(nodeId.nodeId());
+        var opt = p.findAny(it -> it.serialNr() == id);
         return Objects.requireNonNull(opt, "Could not find node with serialNr  " + nodeId.nodeId);
     }
 
@@ -109,7 +110,7 @@ public record ContractId(EnvironmentId envId, String contractId)
      * @author Alexander Weigl
      * @version 1 (29.10.23)
      */
-    public record NodeId(ProofId proofId, int nodeId) implements KeYDataTransferObject {
+    public record NodeId(ProofId proofId, String nodeId) implements KeYDataTransferObject {
     }
 
     public record ProofId(EnvironmentId env, String proofId) implements KeYDataTransferObject {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
index bd4c35bbf8a..4b0809941ba 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -3,18 +3,20 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-import java.nio.file.Path;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  *
- * @param problemFile
- * @param classPath
- * @param bootClassPath
- * @param includes
+ * @param problemFile URI to the problem file to be loaded
+ * @param classPath optional
+ * @param bootClassPath xxx
+ * @param includes xxx
  */
-public record LoadParams(Path problemFile,
-                         List<Path> classPath,
-                         Path bootClassPath,
-                         List<Path> includes) implements KeYDataTransferObject {
+public record LoadParams(@Nullable Uri problemFile,
+        @Nullable List<Uri> classPath,
+        @Nullable Uri bootClassPath,
+        @Nullable List<Uri> includes)
+        implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
index c6e788480ec..09b98b19ccb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroDescription.java
@@ -13,6 +13,7 @@
  */
 public record MacroDescription(String name, String description, String category)
         implements KeYDataTransferObject {
+
     public static MacroDescription from(ProofMacro m) {
         return new MacroDescription(m.getName(), m.getDescription(), m.getCategory());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
index f86b1b90e2e..6002b896c32 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -18,7 +18,8 @@ public record NodeDesc(KeyIdentifications.NodeId nodeid,
         String description) implements KeYDataTransferObject {
     public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel,
             boolean scriptRuleApplication, String description) {
-        this(new KeyIdentifications.NodeId(proofId, serialNr), branchLabel, scriptRuleApplication,
+        this(new KeyIdentifications.NodeId(proofId, "" + serialNr), branchLabel,
+            scriptRuleApplication,
             null, description);
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
index 89c53274b64..d47182cdf78 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -4,10 +4,16 @@
 package org.keyproject.key.api.data;
 
 
+import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
+
 /**
+ * A printed sequent.
+ *
+ * @param id a handle identifying this print-out
+ * @param result the plain textual notation of the sequent
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record NodeTextDesc(KeyIdentifications.NodeTextId id, String result)
+public record NodeTextDesc(NodeTextId id, String result)
         implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
index 4a9ad7d94fe..432dac80244 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -5,8 +5,16 @@
 
 import de.uka.ilkd.key.proof.Proof;
 
+/**
+ *
+ * @param id handle of the proof
+ * @param openGoals open goals
+ * @param closedGoals closed goals
+ * @author teuber
+ */
 public record ProofStatus(KeyIdentifications.ProofId id, int openGoals, int closedGoals)
         implements KeYDataTransferObject {
+
     public static ProofStatus from(KeyIdentifications.ProofId id, Proof proof) {
         return new ProofStatus(id, proof.openGoals().size(), proof.closedGoals().size());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
index 4d5898443cf..5a4042dd009 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
-public record TaskFinishedInfo(long time, int appliedRules, int closedGoals) implements KeYDataTransferObject {
+public record TaskFinishedInfo(long time, int appliedRules, int closedGoals)
+        implements KeYDataTransferObject {
     public static TaskFinishedInfo from(org.key_project.prover.engine.TaskFinishedInfo info) {
         return new TaskFinishedInfo(info.getTime(), info.getAppliedRules(), info.getClosedGoals());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index bf2001a6dcd..9ecd5757c85 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -5,7 +5,8 @@
 
 import org.key_project.prover.engine.TaskStartedInfo.TaskKind;
 
-public record TaskStartedInfo(String message, int size, TaskKind kind) implements KeYDataTransferObject {
+public record TaskStartedInfo(String message, int size, TaskKind kind)
+        implements KeYDataTransferObject {
     public static TaskStartedInfo from(org.key_project.prover.engine.TaskStartedInfo info) {
         return new TaskStartedInfo(info.message(), info.size(), info.kind());
     }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
index 6ac41ee5926..10238c3adb7 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -8,28 +8,18 @@
 /**
  * This class represents an action that can be executed on a term.
  *
+ * @param commandId Unique identification
+ * @param displayName A string to display to the user.
+ * @param description Long description of the action for the user.
+ * @param category A string identifying a category
+ * @param kind Kind of the action
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 public record TermActionDesc(
-        /**
-         * Unique identification
-         */
         TermActionId commandId,
-        /**
-         * A string to display to the user.
-         */
         String displayName,
-        /**
-         * Long description of the action for the user.
-         */
         String description,
-        /**
-         * A string identifying a category
-         */
         String category,
-        /**
-         * Kind of the action
-         */
         TermActionKind kind) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
index 83ace2343de..2b904481ff1 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -4,9 +4,26 @@
 package org.keyproject.key.api.data;
 
 /**
+ * Possible kinds of an action applicable to position on a sequent.
+ *
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
 public enum TermActionKind implements KeYDataTransferObject {
-    BuiltIn, Script, Macro, Taclet
+    /**
+     * Built-In Rule
+     */
+    BuiltIn,
+    /**
+     * Proof Script
+     */
+    Script,
+    /**
+     * Proof Macro
+     */
+    Macro,
+    /**
+     * Taclet
+     */
+    Taclet
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
index 1086952b487..4e4ad0aecab 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
@@ -1,10 +1,13 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
 /**
  * TextRange specifies a range of integer numbers e.g. character positions.
  *
  * @param start this range's (included) start position.
- * @param end   this range's (excluded) end position.
+ * @param end this range's (excluded) end position.
  */
 public record TextRange(int start, int end) implements KeYDataTransferObject {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
index 7b265a20fbb..04f90c009cc 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -13,7 +13,7 @@
 public record TreeNodeDesc(KeyIdentifications.NodeId id, String name)
         implements KeYDataTransferObject {
     public static TreeNodeDesc from(KeyIdentifications.ProofId proofId, Node root) {
-        return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, root.serialNr()),
+        return new TreeNodeDesc(new KeyIdentifications.NodeId(proofId, "" + root.serialNr()),
             root.name());
     }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/Uri.java b/keyext.api/src/main/java/org/keyproject/key/api/data/Uri.java
new file mode 100644
index 00000000000..87319c422fa
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/Uri.java
@@ -0,0 +1,50 @@
+/* This file is part of KeY - https://key-project.org
+ * KeY is licensed under the GNU General Public License Version 2
+ * SPDX-License-Identifier: GPL-2.0-only */
+package org.keyproject.key.api.data;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import com.google.gson.*;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Value class of a uniform resource identifier
+ *
+ * @author Alexander Weigl
+ * @version 1 (11/30/25)
+ */
+public record Uri(String uri) {
+    public static @Nullable Uri from(File sel) {
+        return new Uri(sel.toURI().toString());
+    }
+
+    public Path asPath() {
+        if (uri.startsWith("file://")) {
+            return Paths.get(uri.substring("file://".length()));
+        }
+
+        try {
+            return Paths.get(uri);
+        } catch (Exception ignored) {
+            throw new RuntimeException("Illegal file URI");
+        }
+    }
+
+    public static class UriSerializer implements JsonSerializer<Uri>, JsonDeserializer<Uri> {
+        @Override
+        public Uri deserialize(JsonElement jsonElement, Type type,
+                JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+            return new Uri(jsonElement.getAsString());
+        }
+
+        @Override
+        public JsonElement serialize(Uri uri, Type type,
+                JsonSerializationContext jsonSerializationContext) {
+            return jsonSerializationContext.serialize(uri);
+        }
+    }
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
index d860e245878..6f2beb69fc5 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -14,23 +14,62 @@
 import org.keyproject.key.api.data.SortDesc;
 
 /**
+ * The management (retrieval functions) of proof environments.
+ * Using the following functions, you can obtain information of defined signature (sorts, functions,
+ * etc.)
+ * of an environment.
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 @JsonSegment("env")
 public interface EnvApi {
+
+    /**
+     * A possible empty list of defined sorts in the environment.
+     *
+     * @param env a handle to the environment
+     * @return a list of {@link SortDesc}
+     */
     @JsonRequest
     CompletableFuture<List<SortDesc>> sorts(EnvironmentId env);
 
+    /**
+     * A possible empty list of defined functions in the environment.
+     *
+     * @param env a handle to the environment
+     * @return a list of {@link FunctionDesc}
+     */
     @JsonRequest
     CompletableFuture<List<FunctionDesc>> functions(EnvironmentId env);
 
+    /**
+     * A possible empty list of defined contracts in the environment.
+     *
+     * @param env a handle to the environment
+     * @return a list of {@link ContractDesc}
+     */
     @JsonRequest
     CompletableFuture<List<ContractDesc>> contracts(EnvironmentId env);
 
+    /**
+     * Starts a proof given by the contract handle.
+     *
+     * @param contractId a handle to the environment
+     * @return a handle to a proof encoded as an {@link ProofId}
+     */
     @JsonRequest
     CompletableFuture<ProofId> openContract(ContractId contractId);
 
+    /**
+     * This method frees the memory and datastructure of the given environment {@code env}.
+     * <p>
+     * After calling this method, you are not allowed t use the environment or any proof inside this
+     * environment anymore.
+     *
+     * @param env a handle to the environment
+     * @return true if the environment was dispose.
+     */
     @JsonRequest
     CompletableFuture<Boolean> dispose(EnvironmentId env);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
index e2ee7dc9a8c..e1cf96053eb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
@@ -9,9 +9,30 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.keyproject.key.api.data.ExampleDesc;
+import org.keyproject.key.api.data.KeyIdentifications;
 
+/**
+ * Management of the built-in examples of KeY.
+ *
+ * @author weigl
+ */
 @JsonSegment("examples")
 public interface ExampleApi {
+    /**
+     * A list of examples that are built-in into KeY.
+     *
+     * @return a list of examples descriptions
+     */
     @JsonRequest("list")
     CompletableFuture<List<ExampleDesc>> examples();
+
+    /**
+     * I am not sure whether this is helpful. Mainly a feature for testing?!
+     *
+     * @param name of the example
+     * @return opens a new proof returns a handle
+     * @see ExampleDesc#name()
+     */
+    @JsonRequest
+    CompletableFuture<KeyIdentifications.ProofId> loadExample(String name);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
index 68a9e263708..6c93c433b93 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -9,25 +9,57 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
-import org.keyproject.key.api.data.*;
-import org.keyproject.key.api.data.KeyIdentifications.*;
+import org.keyproject.key.api.data.KeyIdentifications.NodeId;
+import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
+import org.keyproject.key.api.data.KeyIdentifications.TermActionId;
 import org.keyproject.key.api.data.NodeTextDesc;
+import org.keyproject.key.api.data.PrintOptions;
+import org.keyproject.key.api.data.TermActionDesc;
 
 /**
+ * Working with goals: This includes the applications of rules, macros and user interaction to
+ * sequents.
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 @JsonSegment("goal")
 public interface GoalApi {
+    /**
+     * Prints the sequent of the given node using the given {@code options}.
+     *
+     * @param id a handle of a node
+     * @param options printing options
+     * @return the printed sequent
+     */
     @JsonRequest
     CompletableFuture<NodeTextDesc> print(NodeId id, PrintOptions options);
 
+    /**
+     * Finds possible actions for the print-out given handle {@code id} and the
+     * textual positon {@code pos}. Caret position starts with 0.
+     *
+     * @param id handle
+     * @param caretPos position inside the print-out (0<= pos < text_length)
+     * @return a list of possible actions that can be invoked at the caret position.
+     */
     @JsonRequest
-    CompletableFuture<List<TermActionDesc>> actions(NodeTextId id, int pos);
+    CompletableFuture<List<TermActionDesc>> actions(NodeTextId id, int caretPos);
 
+    /**
+     * Applies the given action identify by {@code id}.
+     *
+     * @param id a handle to a term action
+     * @return true
+     */
     @JsonRequest("apply_action")
-    CompletableFuture<List<TermActionDesc>> applyAction(TermActionId id);
+    CompletableFuture<Boolean> applyAction(TermActionId id);
 
+    /**
+     * Frees the privious occupied print-out of a sequent.
+     *
+     * @param id
+     */
     @JsonNotification("free")
     void freePrint(NodeTextId id);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
index a94b35967af..4d4f168f3eb 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -6,6 +6,13 @@
 /**
  * The combined interface that is provided by KeY.
  */
-public interface KeyApi extends ExampleApi, MetaApi, ServerManagement, ProofApi, ProofTreeApi,
-        GoalApi, EnvApi, ProofLoadApi {
+public interface KeyApi extends
+        ExampleApi,
+        MetaApi,
+        ServerManagement,
+        ProofApi,
+        ProofTreeApi,
+        GoalApi,
+        EnvApi,
+        ProofLoadApi {
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
index ea2c8174a58..252008f0b81 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
@@ -12,14 +12,28 @@
 import org.keyproject.key.api.data.ProofMacroDesc;
 import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
+/**
+ * The meta segments provides functionalities around the KeY systems and environment.
+ */
 @JsonSegment("meta")
 public interface MetaApi {
+    /**
+     * The current version string.
+     *
+     * @return version of KeY
+     */
     @JsonRequest("version")
     CompletableFuture<String> getVersion();
 
+    /**
+     * @return a list of available proof macros
+     */
     @JsonRequest("available_macros")
     CompletableFuture<List<ProofMacroDesc>> getAvailableMacros();
 
+    /**
+     * @return a list of available proof script commands
+     */
     @JsonRequest("available_script_commands")
     CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands();
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
index a94da74f1dc..2c4f76978ad 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -15,40 +15,107 @@
 import org.keyproject.key.api.data.StrategyOptions;
 
 /**
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 @JsonSegment("proof")
 public interface ProofApi {
+    /**
+     *
+     * @param proofId
+     * @return
+     */
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
-            StrategyOptions options);
+    CompletableFuture<NodeDesc> root(ProofId proofId);
+
+    /**
+     * Executes the given {@code script} against the proof using the given {@code options}.
+     *
+     * @param proof handle of a proof
+     * @param script proof script
+     * @param options options towards the proof strategy
+     * @return the run-time statistics
+     */
+    @JsonRequest
+    CompletableFuture<MacroStatistic> script(ProofId proof, String script, StrategyOptions options);
 
+    /**
+     * Executes the macro given by {@code macroName} against the proof
+     * using the given {@code options}.
+     *
+     * @param proof handle of a proof
+     * @param macroName proof script
+     * @param options options towards the proof strategy
+     * @return the run-time statistics
+     */
     @JsonRequest
     CompletableFuture<MacroStatistic> macro(ProofId proof, String macroName,
             StrategyOptions options);
 
+    /**
+     * Auto against the proof
+     *
+     * @param proof handle of a proof
+     * @param options options towards the proof strategy
+     * @return
+     */
     @JsonRequest
     CompletableFuture<ProofStatus> auto(ProofId proof, StrategyOptions options);
 
+    /**
+     * Frees the resources occupied by the proof.
+     *
+     * @param proof
+     * @return
+     */
     @JsonRequest
     CompletableFuture<Boolean> dispose(ProofId proof);
 
+    /**
+     *
+     * @param proof
+     * @param onlyOpened
+     * @param onlyEnabled
+     * @return
+     */
     @JsonRequest
     CompletableFuture<List<NodeDesc>> goals(ProofId proof, boolean onlyOpened, boolean onlyEnabled);
 
+    /**
+     *
+     * @param proof
+     * @return
+     */
     @JsonRequest
     CompletableFuture<NodeDesc> tree(ProofId proof);
 
-    @JsonRequest
-    CompletableFuture<NodeDesc> root(ProofId proof);
-
+    /**
+     *
+     * @param nodeId
+     * @return
+     */
     @JsonRequest
     CompletableFuture<List<NodeDesc>> children(NodeId nodeId);
 
+    /**
+     * Prunes the proof branch from the leafs to the given {@code nodeId}.
+     *
+     * @param nodeId
+     * @return
+     */
     @JsonRequest
     CompletableFuture<List<NodeDesc>> pruneTo(NodeId nodeId);
 
-    // @JsonRequest
-    // CompletableFuture<Statistics> statistics(ProofId proof);
+    /**
+     *
+     * TODO
+     *
+     * @param proof
+     * @return
+     */
+    @JsonRequest
+    default CompletableFuture<Void> statistics(ProofId proof) {
+        return CompletableFuture.completedFuture(null);
+    }
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 2b5f5e78187..79758a951b0 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -23,27 +23,28 @@
  */
 @JsonSegment("loading")
 public interface ProofLoadApi {
+
     /**
-     * I am not sure whether this is helpful. Mainly a feature for testing?!
      *
-     * @param id
+     * @param problem
      * @return
      */
     @JsonRequest
-    CompletableFuture<ProofId> loadExample(String id);
+    CompletableFuture<ProofId> loadProblem(ProblemDefinition problem);
 
     /**
      *
+     * @param content
+     * @return
      */
     @JsonRequest
-    CompletableFuture<ProofId> loadProblem(ProblemDefinition problem);
+    CompletableFuture<ProofId> loadKey(String content);
 
     /**
      *
+     * @param term
+     * @return
      */
-    @JsonRequest
-    CompletableFuture<ProofId> loadKey(String content);
-
     @JsonRequest
     CompletableFuture<ProofId> loadTerm(String term);
 
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
index cd4aa88b146..6f0d14a2aed 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -13,17 +13,38 @@
 import org.keyproject.key.api.data.TreeNodeDesc;
 
 /**
+ * Operations on the proof tree.
+ *
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
 @JsonSegment("proofTree")
 public interface ProofTreeApi {
+    /**
+     * Returns the node root of the tree.
+     *
+     * @param id
+     * @return
+     */
     @JsonRequest("root")
     CompletableFuture<TreeNodeDesc> treeRoot(ProofId id);
 
+    /**
+     *
+     * @param proof
+     * @param nodeId
+     * @return
+     */
     @JsonRequest("children")
     CompletableFuture<List<TreeNodeDesc>> treeChildren(ProofId proof, TreeNodeId nodeId);
 
+    /**
+     *
+     * @param proof
+     * @param nodeId
+     *        TODO param depth
+     * @return
+     */
     @JsonRequest("subtree")
     CompletableFuture<List<TreeNodeDesc>> treeSubtree(ProofId proof, TreeNodeId nodeId);
 }
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
index a5d3a1deb39..198e4706b07 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -17,7 +17,8 @@
  * This segment contains the functionalities that a client needs to implement.
  * Mainly, it is logging and displaying of information.
  */
-@JsonSegment("client") @NullMarked
+@JsonSegment("client")
+@NullMarked
 public interface ClientApi {
     /**
      * A notification to log the trace of the server’s execution.
@@ -71,8 +72,8 @@ public interface ClientApi {
      *
      * @param position some integer
      * @TODO weigl: This call is stupid w/o information of the task assigned.
-     * we also should send max value for showing a progress indicator,
-     * and a message.
+     *       we also should send max value for showing a progress indicator,
+     *       and a message.
      */
     @JsonNotification
     void taskProgress(int position);
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
index 1a884c04c1e..6dcb08fb585 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -7,6 +7,8 @@
 
 /**
  * @param message The message to be logged.
- * @param level   Additional information that can be computed if the `trace` configuration is set to `'verbose'`
+ * @param level Additional information that can be computed if the `trace` configuration is set to
+ *        `'verbose'`
  */
-public record LogTraceParams(@NonNull String message, String level) {}
+public record LogTraceParams(@NonNull String message, String level) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
index e15b48085f8..69491ca5398 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -3,25 +3,24 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
-import de.uka.ilkd.key.pp.Range;
 import org.jspecify.annotations.Nullable;
 import org.keyproject.key.api.data.TextRange;
 
 /**
  * Information to show a document on the client side.
  *
- * @param uri       The uri to show.
- * @param external  Indicates to show the resource in an external program.
- *                  To show, for example, `https://code.visualstudio.com/`
- *                  in the default WEB browser set `external` to `true`.
+ * @param uri The uri to show.
+ * @param external Indicates to show the resource in an external program.
+ *        To show, for example, `https://code.visualstudio.com/`
+ *        in the default WEB browser set `external` to `true`.
  * @param takeFocus An optional property to indicate whether the editor
- *                  showing the document should take focus or not.
- *                  Clients might ignore this property if an external
- *                  program is started.
+ *        showing the document should take focus or not.
+ *        Clients might ignore this property if an external
+ *        program is started.
  * @param selection An optional selection range if the document is a text
- *                  document. Clients might ignore the property if an
- *                  external program is started or the file is not a text
- *                  file.
+ *        document. Clients might ignore the property if an
+ *        external program is started or the file is not a text
+ *        file.
  */
 public record ShowDocumentParams(
         String uri,
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
index 925d94d96fb..85b3c24c21f 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -6,4 +6,5 @@
 /**
  * @param success A boolean indicating if the show was successful.
  */
-public record ShowDocumentResult(boolean success) {}
+public record ShowDocumentResult(boolean success) {
+}
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
index cdf2f3d2280..3ed56927c85 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -4,7 +4,7 @@
 package org.keyproject.key.api.remoteclient;
 
 /**
- * @param type    The message type. See {@link MessageType}.
+ * @param type The message type. See {@link MessageType}.
  * @param message the actual message
  */
 public record ShowMessageParams(MessageType type, String message) {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
index 5c7f17d9f18..3f1c3e8be59 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * @param type    The message type. See {@link MessageType}.
+ * @param type The message type. See {@link MessageType}.
  * @param message the actual message
  */
 public record ShowMessageRequestParams(
diff --git a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
index 6ef38f569a1..3be5c910081 100644
--- a/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -26,7 +26,8 @@ public void showMessage(ShowMessageParams params) {
 
     @Nullable
     @Override
-    public CompletableFuture<MessageActionItem> showMessageWithActions(ShowMessageRequestParams params) {
+    public CompletableFuture<MessageActionItem> showMessageWithActions(
+            ShowMessageRequestParams params) {
         return null;
     }
 
diff --git a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
index cd023d4f8eb..c90fd8ec61c 100644
--- a/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -26,12 +26,8 @@
 import org.jspecify.annotations.NullMarked;
 import org.keyproject.key.api.KeyApiImpl;
 import org.keyproject.key.api.StartServer;
-import org.keyproject.key.api.data.KeyIdentifications;
-import org.keyproject.key.api.data.LoadParams;
-import org.keyproject.key.api.data.TaskFinishedInfo;
-import org.keyproject.key.api.data.TaskStartedInfo;
+import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.data.PrintOptions;
 import org.keyproject.key.api.remoteclient.*;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;
@@ -104,7 +100,7 @@ private void openFile() {
         if (sel != null) {
             try {
                 loadedProof = keyApi.load(
-                    new LoadParams(sel.toPath(), null, null, null))
+                    new LoadParams(Uri.from(sel), null, null, null))
                         .get().getRight();
                 var root = keyApi.root(loadedProof).get();
                 var sequent =
@@ -130,7 +126,8 @@ public void showMessage(ShowMessageParams params) {
         }
 
         @Override
-        public CompletableFuture<MessageActionItem> showMessageWithActions(ShowMessageRequestParams params) {
+        public CompletableFuture<MessageActionItem> showMessageWithActions(
+                ShowMessageRequestParams params) {
             return null;
         }
 

From 46fd3b7dc88bc4483bfccc2415de57caf1001ca5 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 21 Dec 2025 14:53:21 +0100
Subject: [PATCH 49/50] try to make the documentation better

---
 .../src/main/resources/templates/docs.ftl     | 19 +++++++++++++++++--
 .../keyproject/key/api/data/DataExamples.java | 18 ++++++++++++++----
 .../key/api/remoteapi/ProofLoadApi.java       |  6 ++----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/keyext.api.doc/src/main/resources/templates/docs.ftl b/keyext.api.doc/src/main/resources/templates/docs.ftl
index 2103b5f798a..f20640ad689 100644
--- a/keyext.api.doc/src/main/resources/templates/docs.ftl
+++ b/keyext.api.doc/src/main/resources/templates/docs.ftl
@@ -5,9 +5,9 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/main.618322db.min.css"/>
+    <!--<link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/main.618322db.min.css"/>
     <link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/palette.ab4e12ef.min.css">
-    <title></title>
+-->    <title></title>
 </head>
 <body>
 
@@ -17,6 +17,9 @@
         width: 60em;
         margin: auto;
     }
+    body {
+		    font-size: 12pt;
+    }
 
     div.data-type {
         span.kind {
@@ -52,7 +55,19 @@
     }
 </style>
 
+<#list types as type>
+	<a href="#${type.name}">${type.name()}</a>
+</#list>
+
+
+<#list endpoints as ep>
+	<a href="#${ep.name}">${ep.name()}</a>
+</#list>
+
+
+
 <h3>Types</h3>
+
 <#list types as type>
     <#assign isEnum = true>
     <#if type.fields??>
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java b/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
index 07771877d3f..621494e9b03 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/DataExamples.java
@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import java.io.File;
 import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ExecutionException;
@@ -15,6 +17,8 @@
 import com.google.gson.GsonBuilder;
 import org.jspecify.annotations.Nullable;
 import org.keyproject.key.api.KeyApiImpl;
+import org.keyproject.key.api.data.KeyIdentifications.EnvironmentId;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
 import org.keyproject.key.api.remoteapi.ServerManagement;
 import org.keyproject.key.api.remoteclient.ShowDocumentParams;
 import org.keyproject.key.api.remoteclient.ShowDocumentResult;
@@ -73,12 +77,18 @@ public ProofStatus getProofStatus() {
         return new ProofStatus(getProofId(), 10, 23);
     }
 
-    public KeyIdentifications.ProofId getProofId() {
-        return new KeyIdentifications.ProofId(getEnvId(), "proof-5");
+    public LoadParams getLoadParams() {
+        return new LoadParams(Uri.from(new File("/home/weigl/test.key")),
+                List.of(), null, List.of());
     }
 
-    public KeyIdentifications.EnvironmentId getEnvId() {
-        return new KeyIdentifications.EnvironmentId("env-1");
+
+    public ProofId getProofId() {
+        return new ProofId(getEnvId(), "proof-5");
+    }
+
+    public EnvironmentId getEnvId() {
+        return new EnvironmentId("env-1");
     }
 
     public ShowDocumentParams getSDP() {
diff --git a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
index 79758a951b0..00e4c93cfc8 100644
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoadApi.java
@@ -25,7 +25,7 @@
 public interface ProofLoadApi {
 
     /**
-     *
+     * Do not use. Not implemented
      * @param problem
      * @return
      */
@@ -49,10 +49,8 @@ public interface ProofLoadApi {
     CompletableFuture<ProofId> loadTerm(String term);
 
     /**
-     * Test!
-     *
      * @param params parameters for loading
-     * @return
+     * @return either an {@link EnvironmentId or a ProofId depending on the given params.}
      * @throws ProblemLoaderException if something went wrong
      */
     @JsonRequest

From d94ff143d4b61352654389468625d4f61006f878 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 27 Dec 2025 22:27:51 +0100
Subject: [PATCH 50/50] better documentation

---
 .../org/key_project/key/api/doc/DocGen.java   |  40 +-
 .../src/main/resources/templates/docs.ftl     | 345 ++++++++++++------
 2 files changed, 250 insertions(+), 135 deletions(-)

diff --git a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
index 4e66c3b8054..69da9c866de 100644
--- a/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -3,13 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.key_project.key.api.doc;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.function.Supplier;
-
+import de.uka.ilkd.key.util.KeYConstants;
+import de.uka.ilkd.key.util.KeYResourceManager;
 import freemarker.core.HTMLOutputFormat;
 import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
 import freemarker.template.Configuration;
@@ -17,6 +12,12 @@
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
 /**
  * Generation of Markdown documentation.
  *
@@ -38,6 +39,7 @@ public String get() {
             var cfg = new Configuration(Configuration.VERSION_2_3_32);
             cfg.setClassForTemplateLoading(DocGen.class, "/templates"); // classpath
             cfg.setDefaultEncoding("UTF-8");
+            cfg.setAutoEscapingPolicy(Configuration.DISABLE_AUTO_ESCAPING_POLICY);
             cfg.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
             cfg.setLogTemplateExceptions(false);
             cfg.setWrapUncheckedExceptions(true);
@@ -49,7 +51,7 @@ public String get() {
             wrapper.setExposeFields(true);
             wrapper.setMethodsShadowItems(true);
             wrapper.setRecordZeroArgumentNonVoidMethodPolicy(
-                ZeroArgumentNonVoidMethodPolicy.BOTH_METHOD_AND_PROPERTY_UNLESS_BEAN_PROPERTY_READ_METHOD);
+                    ZeroArgumentNonVoidMethodPolicy.BOTH_METHOD_AND_PROPERTY_UNLESS_BEAN_PROPERTY_READ_METHOD);
             wrapper.setForceLegacyNonListCollections(false);
             wrapper.setDefaultDateType(freemarker.template.TemplateDateModel.DATETIME);
             cfg.setObjectWrapper(wrapper);
@@ -60,15 +62,25 @@ public String get() {
             model.put("segmentDocumentation", metamodel.segmentDocumentation());
 
             model.put("endpoints",
-                metamodel.endpoints()
-                        .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
-                        .toList());
+                    metamodel.endpoints()
+                            .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                            .toList());
+
+            final Map<String, List<Metamodel.Endpoint>> collect = metamodel.endpoints()
+                    .stream().sorted(Comparator.comparing(Metamodel.Endpoint::name))
+                    .collect(Collectors.groupingBy(Metamodel.Endpoint::segment, TreeMap::new, Collectors.toList()));
+
+            model.put("endpointsBySegment", collect);
 
             model.put("types",
-                metamodel.types().values()
-                        .stream().sorted(Comparator.comparing(Metamodel.Type::name))
-                        .toList());
+                    metamodel.types().values()
+                            .stream().sorted(Comparator.comparing(Metamodel.Type::name))
+                            .toList());
 
+            model.put("version",
+                    KeYResourceManager.getManager().getVersion() +
+                            " (" + KeYConstants.INTERNAL_VERSION.substring(0, 8) + ")");
+            model.put("date", new Date());
 
             // 3) Get template
             var tpl = cfg.getTemplate("docs.ftl");
diff --git a/keyext.api.doc/src/main/resources/templates/docs.ftl b/keyext.api.doc/src/main/resources/templates/docs.ftl
index f20640ad689..a135cdf6c05 100644
--- a/keyext.api.doc/src/main/resources/templates/docs.ftl
+++ b/keyext.api.doc/src/main/resources/templates/docs.ftl
@@ -1,24 +1,19 @@
 <#-- @ftlvariable name="types" type="java.util.Collection<org.key_project.key.api.doc.Metamodel.Type>" -->
 <#-- @ftlvariable name="endpoints" type="java.util.Collection<org.key_project.key.api.doc.Metamodel.Endpoint>" -->
 <#-- @ftlvariable name="segmentDocumentation" type="java.util.Map<String,String>" -->
+<#-- @ftlvariable name="endpointsBySegment" type="java.util.Map<String, java.util.List<org.key_project.key.api.doc.Metamodel.Endpoint>>" -->
 
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <!--<link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/main.618322db.min.css"/>
-    <link rel="stylesheet" href="https://keyproject.github.io/key-docs/assets/stylesheets/palette.ab4e12ef.min.css">
--->    <title></title>
+	<meta charset="utf-8">
+	<title>KeY API Documentation</title>
 </head>
 <body>
 
 <style>
     html {
-        font-family: sans-serif;
-        width: 60em;
-        margin: auto;
-    }
-    body {
-		    font-size: 12pt;
+        font-family: "Roboto", sans-serif;
+        font-size: 12pt;
     }
 
     div.data-type {
@@ -53,149 +48,257 @@
         font-family: "Fira Code Light", monospace;
         margin-left: 5ex;
     }
-</style>
 
-<#list types as type>
-	<a href="#${type.name}">${type.name()}</a>
-</#list>
+    body {
+        margin: 0;
+    }
 
+    #main {
+        display: grid;
+        grid-template-columns: 15% 70%;
+        gap: 1%;
+    }
 
-<#list endpoints as ep>
-	<a href="#${ep.name}">${ep.name()}</a>
-</#list>
+    #nav {
+        padding: 0em 1em 0em 1em;
+        background: #444;
+        color: white;
+        font-size: 80%;
 
+        a {
+            color: white;
+        }
 
+        ul {
 
-<h3>Types</h3>
+        }
 
-<#list types as type>
-    <#assign isEnum = true>
-    <#if type.fields??>
-        <#assign isEnum = false>
-    </#if>
+        li {
+        }
+    }
 
-    <div id="${type.name()}" class="data-type ${isEnum?string("enum","type")}">
-        <h3>${type.name()} <span class="kind"> ${isEnum?string("enum","type")}</span></h3>
-        <code class="highlight">
-            <span class="k">${isEnum?string("enum","type")}</span>
-            <span class="kc">${type.name()}</span> { <br/>
-            <#if type.fields??>
-                <#list type.fields as field>
-                    <div class="entry field">
-                        <#if field.documentation()??>
-                            <div class="cm">/* ${field.documentation.text} */</div>
-                        </#if>
-                        <div><span class="kc">${field.type()}</span>&nbsp;<span
-                                    class="nv">${field.name()}</span>;
-                        </div>
-                    </div>
-                </#list>
-            </#if>
-            <#if type.values??>
-                <#list type.values()?sort as value>
-                    <#if value.documentation??>
-                        /* ${value.documentation.text} */
-                    </#if>
-                    ${value.value()}
+    #content {
+        padding: 0em 1em 0em 1em;
+    }
+
+    .highlight {
+        background: #ddd;
+        font-family: "Fira Code Light", monospace;
+        padding: 1ex;
+
+		    .entry{
+				    margin-top: 1ex;
+		    }
+        .k {
+            font-weight: bold;
+            color: darkviolet;
+        }
+
+        .cm {
+            color: darkgreen;
+		        font-style: italic;
+        }
+
+        .kc {
+            color: blue;
+        }
+
+
+    }
+</style>
+
+<div id="main">
+	<nav id="nav">
+		<h1>Documentation: KeY JSON-RPC API</h1>
+
+		<div>
+			Version: ${version}<br>
+			Date: ${date}
+		</div>
+
+		<h2>Types</h2>
+
+		<ul>
+        <#list types as type>
+					<li><a href="#${type.name}">${type.name()}</a></li>
+        </#list>
+		</ul>
+
+		<h2>Procedures</h2>
+		<ul>
+        <#list endpointsBySegment as segname, seq>
+					<li><abbr title="${(segmentDocumentation[segname].text)!"n/a"}">${segname}</abbr>
+						<ul>
+                <#list seq as ep>
+									<li><a href="#${ep.name}">${ep.name()}</a></li>
                 </#list>
+						</ul>
+					</li>
+        </#list>
+		</ul>
+	</nav>
+	<div id="content">
+		<h2>Base Definitions</h2>
+		<p>
+			This API builds upon and uses the same convention as the <a
+							href="https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/">Language
+				Server Protocol</a>.
+			In basic, the protocol builds upon a simple HTTP protocol with a JSON playoad. A request message looks as
+		</p>
+		<div class="highlight"><pre>Content-Length: 80\r\n
+Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n
+\r\n
+{
+	"jsonrpc": "2.0",
+	"id": 1,
+	"method": "env/version",
+	"params": {
+		...
+	}
+}</pre></div>
+		<p>
+			Header <code>Content-Type</code> is optional. The <code>\r\n</code> are mandatory. The field <code>id</code> make
+			the difference between a request or a notification. Later do not result into a response. A response message
+			contains the fields <code>result</code> or <code>error</code>, depending on a normal or exceptional execution of
+			the request.
+		</p>
+		<p>
+			The communication is always asynchronous and duplex. Meaning you can send and receive messages at any time.
+			For synchronous calls, the client and server library need to implement a waiting mechanism.
+		</p>
+
+
+		<h2>Types</h2>
+		<div class="data-type">
+        <#list types as type>
+            <#assign isEnum = true>
+            <#if type.fields??>
+                <#assign isEnum = false>
             </#if>
-            }
-        </code>
-        <#if type.documentation??>
-            <div class="documentation">
-                <p>
-                    ${type.documentation.text}
-                </p>
-                <ul>
-                    <#list type.documentation.others as o>
-                        <li><strong>${o.name}:</strong> ${o.value}</li>
+
+					<div id="${type.name()}" class="data-type ${isEnum?string("enum","type")}">
+						<h3>${type.name()} <span class="kind"> ${isEnum?string("enum","type")}</span></h3>
+						<div class="highlight">
+							<span class="k">${isEnum?string("enum","type")}</span>
+							<span class="kc"><a href="#${type.name()}">${type.name()}</a></span> { <br/>
+                <#if type.fields??>
+                    <#list type.fields as field>
+											<div class="entry field">
+                          <#if field.documentation()??>
+														<div class="cm">/* ${field.documentation.text} */</div>
+                          </#if>
+												<div><span class="kc"><a href="#${type.name()}">${type.name()}</a></span>&nbsp;<span
+																	class="nv">${field.name()}</span>;
+												</div>
+											</div>
                     </#list>
-                </ul>
-            </div>
-
-            <#if (type.jsonExample)??>
-                <div>
-                    <details>
-                        <summary>Example</summary>
-                        <code class="highlight" style="white-space: pre">${type.jsonExample}</code>
-                    </details>
-                </div>
-            </#if>
-        </#if>
-    </div>
-</#list>
-
-
-<h2 id="endpoints">Endpoints</h2>
-<#assign lastSegment = "">
-<div>
-    <#list endpoints as ep>
-        <#if lastSegment!=ep.segment()>
-            <#assign lastSegment = ep.segment()>
-            <h3 id="${lastSegment}">Segment: ${lastSegment}</h3>
-            <#if segmentDocumentation[lastSegment]??>
-                <#assign doc = segmentDocumentation[lastSegment]>
-                <div class="documentation">
-                    <p>
+                </#if>
+                <#if type.values??>
+                    <#list type.values()?sort as value>
+                        <#if value.documentation??>
+													/* ${value.documentation.text} */
+                        </#if>
+                        ${value.value()}
+                    </#list>
+                </#if>
+							}
+						</div>
+              <#if type.documentation??>
+								<div class="documentation">
+									<p>
+                      ${type.documentation.text}
+									</p>
+									<ul>
+                      <#list type.documentation.others as o>
+												<li><strong>${o.name}:</strong> ${o.value}</li>
+                      </#list>
+									</ul>
+								</div>
+
+                  <#if (type.jsonExample)??>
+										<div>
+											<details>
+												<summary>Example</summary>
+												<code class="highlight" style="white-space: pre">${type.jsonExample}</code>
+											</details>
+										</div>
+                  </#if>
+              </#if>
+					</div>
+        </#list>
+		</div>
+
+		<h2 id="endpoints">Endpoints</h2>
+      <#assign lastSegment = "">
+		<div class="endpoints">
+        <#list endpoints as ep>
+            <#if lastSegment!=ep.segment()>
+                <#assign lastSegment = ep.segment()>
+							<h3 id="${lastSegment}">Segment: ${lastSegment}</h3>
+                <#if segmentDocumentation[lastSegment]??>
+                    <#assign doc = segmentDocumentation[lastSegment]>
+									<div class="documentation">
+										<p>
                         ${doc.text}
-                    </p>
-                    <ul>
+										</p>
+										<ul>
                         <#list doc.others as o>
-                            <li><strong>${o.name}:</strong> ${o.value}</li>
+													<li><strong>${o.name}:</strong> ${o.value}</li>
                         </#list>
-                    </ul>
-                </div>
+										</ul>
+									</div>
+                </#if>
             </#if>
-        </#if>
 
-        <div id="${ep.name()}" class="endpoint ${ep.isAsync()?string("async","sync")} ${ep.sender()}">
-            <h4>
+					<div id="${ep.name()}" class="endpoint ${ep.isAsync()?string("async","sync")} ${ep.sender()}">
+						<h4>
                 <#if ep.isAsync()>
-                    <span class="async">Notification:</span>
+									<span class="async">Notification:</span>
                 <#else>
-                    <span class="sync">Request:</span>
+									<span class="sync">Request:</span>
                 </#if>
                 ${ep.name()}
-                <span class="direction">
+							<span class="direction">
                     <#if ep.sender() == "Server" && ep.isAsync()>
-                        server ~~> client
+	                    server ~~> client
                     <#elseif ep.sender() == "Server" && !ep.isAsync()>
-                        server --> client
+	                    server --> client
                     <#elseif ep.sender() == "Client" && !ep.isAsync()>
-                        client --> server
+	                    client --> server
                     <#elseif ep.sender() == "Client" && ep.isAsync()>
-                        client ~~> server
+	                    client ~~> server
                     </#if>
                 </span>
-            </h4>
+						</h4>
 
-            <code class="highlight">
+						<code class="highlight">
                 ${ep.name()}<span class="p">(</span>
                 <#list ep.args() as arg>
-                    <span class="kc">${arg.type}</span>
-                    <span class="nv">${arg.name}</span><#sep><span class="p">,</span></#sep>
+	                <span class="kc"><a href="#${arg.type}">${arg.type}</a></span>
+									<span class="nv">${arg.name}</span><#sep><span class="p">,</span></#sep>
                 </#list>
-                <span class="p">)</span>
+							<span class="p">)</span>
                 <#if ep.returnType??>
-                    <span class="p">:</span>
-                    <span class="kc">${ep.returnType.identifier()}</span>
+									<span class="p">:</span>
+	                <span class="kc"><a href="#${ep.returnType.name()}">${ep.returnType.name()}</a></span>
                 </#if>
-            </code>
-            <#if ep.documentation??>
-                <div class="documentation">
-                    <p>
-                        ${ep.documentation.text}
-                    </p>
-                    <ul>
-                        <#list ep.documentation.others as o>
-                            <li><strong>${o.name}:</strong> ${o.value}</li>
-                        </#list>
-                    </ul>
-                </div>
-            </#if>
-        </div>
-    </#list>
+						</code>
+              <#if ep.documentation??>
+								<div class="documentation">
+									<p>
+                      ${ep.documentation.text}
+									</p>
+									<ul>
+                      <#list ep.documentation.others as o>
+												<li><strong>${o.name}:</strong> ${o.value}</li>
+                      </#list>
+									</ul>
+								</div>
+              </#if>
+					</div>
+        </#list>
+		</div>
+	</div>
 </div>
-
 </body>
 </html>