From 81b32569b9e4c7d61fcf162efacfdef1aa0deaf2 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/35] some functions for tff

# Conflicts:
#	settings.gradle
---
 .../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 f5e40873058..02505ac383e 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
@@ -39,15 +39,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.
      */
@@ -77,149 +68,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
@@ -364,34 +213,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 b1ff8b8011b..8be9e773bee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,6 +30,8 @@ include "keyext.slicing"
 include "keyext.caching"
 include "keyext.isabelletranslation"
 
+include 'keyext.api'
+
 // ENABLE NULLNESS here or on the CLI
 // This flag is activated to enable the checker framework.
 // System.setProperty("ENABLE_NULLNESS", "true")

From 7b8ca788c6a5ffce7faaa2addad7a0785be7be8e 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/35] different clients

---
 .../java/de/uka/ilkd/key/gui/Example.java     |  24 +-
 keyext.api/build.gradle                       |  24 +-
 .../key/{ => api}/FileTypeAdapter.java        |  11 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |  66 ++++++
 .../key/{ => api}/remoteapi/KeyApiImpl.java   |  28 ++-
 .../{ => api}/remoteapi/KeyExampleApi.java    |  12 +-
 .../key/{ => api}/remoteapi/KeyMetaApi.java   |  13 +-
 .../{ => api}/remoteapi/MacroDescription.java |   5 +-
 .../keyproject/key/api/remoteapi/ProofId.java |   7 +
 .../key/api/remoteapi/ProofLoading.java       |  23 ++
 .../key/api/remoteapi/TraceValue.java         |   8 +
 .../key/api/remoteclient/ClientApi.java       |  76 ++++++
 .../org/keyproject/key/remoteapi/KeyApi.java  |  58 -----
 .../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 -
 .../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  |  30 ++-
 .../org/keyproject/key/api/SimpleClient.java  |  38 +++
 22 files changed, 332 insertions(+), 480 deletions(-)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/FileTypeAdapter.java (70%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyApiImpl.java (62%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyExampleApi.java (63%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/KeyMetaApi.java (72%)
 rename keyext.api/src/main/java/org/keyproject/key/{ => api}/remoteapi/MacroDescription.java (57%)
 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
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
 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/KeyApi.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/remoteapi/TraceValue.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 (65%)
 create mode 100644 keyext.api/src/test/java/org/keyproject/key/api/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
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/keyext.api/build.gradle b/keyext.api/build.gradle
index 463b7dbc11a..c1805081940 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.gradleup.shadow' version "9.0.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 70%
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..11ec95d1430 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,12 +1,15 @@
-package org.keyproject.key;
+/* 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 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 {
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
new file mode 100644
index 00000000000..21c3400574d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApi.java
@@ -0,0 +1,66 @@
+/* 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;
+
+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
+}
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 62%
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..d95e856b4b0 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,28 +1,33 @@
-package org.keyproject.key.remoteapi;
+/* 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.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 {
+public class KeyApiImpl implements KeyApi {
     @Override
     @JsonRequest
     public CompletableFuture<List<Example>> examples() {
-        return CompletableFutures.computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+        return CompletableFutures
+                .computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
     }
 
     @Override
-    public Void shutdown() {
-        return null;
+    public CompletableFuture<Void> shutdown() {
+        return CompletableFuture.completedFuture(null);
     }
 
     @Override
@@ -43,14 +48,13 @@ public CompletableFuture<String> getVersion() {
     @Override
     public CompletableFuture<List<MacroDescription>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-                KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
-                        .toList()
-        );
+            KeYApi.getMacroApi().getMacros().stream().map(MacroDescription::from)
+                    .toList());
     }
 
     @Override
     public CompletableFuture<List<ProofScriptCommand<?>>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-                KeYApi.getScriptCommandApi().getScriptCommands().stream().toList());
+            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/api/remoteapi/KeyExampleApi.java
similarity index 63%
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..9f91e82baa0 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,12 +1,16 @@
-package org.keyproject.key.remoteapi;
+/* 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.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")
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 72%
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..3a1a027f233 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,13 +1,16 @@
-package org.keyproject.key.remoteapi;
+/* 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.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
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 57%
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..95084b3716d 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,7 @@
-package org.keyproject.key.remoteapi;
+/* 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.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..8081219c642
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
@@ -0,0 +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;
+
+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..745a93bc969
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
@@ -0,0 +1,23 @@
+/* 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.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;
+}
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/remoteapi/TraceValue.java
new file mode 100644
index 00000000000..11a082303f0
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/TraceValue.java
@@ -0,0 +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.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..3bbf856af3d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ClientApi.java
@@ -0,0 +1,76 @@
+/* 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 org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
+
+@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/KeyApi.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
deleted file mode 100644
index 76c2d1eefdd..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/KeyApi.java
+++ /dev/null
@@ -1,58 +0,0 @@
-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/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/remoteapi/TraceValue.java b/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
deleted file mode 100644
index 1d1d4859e57..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/remoteapi/TraceValue.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.keyproject.key.remoteapi;
-
-public enum TraceValue {
-    Off, Message, All;
-}
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 65%
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..5ff2d0725f4 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,21 +1,27 @@
-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;
+/* 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;
 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;
 
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
+import org.keyproject.key.api.remoteapi.KeyApi;
+import org.keyproject.key.api.remoteclient.ClientApi;
+
 public class Client {
-    public static void main(String[] args) throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    public static void main(String[] args)
+            throws IOException, ExecutionException, InterruptedException, TimeoutException {
         PipedInputStream inClient = new PipedInputStream();
         PipedOutputStream outClient = new PipedOutputStream();
         PipedInputStream inServer = new PipedInputStream();
@@ -24,7 +30,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 +38,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();
 
@@ -42,12 +48,10 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         var clientListening = clientLauncher.startListening();
         var serverListening = serverLauncher.startListening();
 
-        //clientLauncher.getRemoteProxy().examples();
+        // clientLauncher.getRemoteProxy().examples();
         serverLauncher.getRemoteProxy().sayHello("Alex");
 
         serverListening.get(1, TimeUnit.SECONDS);
         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..6e92beff41c
--- /dev/null
+++ b/keyext.api/src/test/java/org/keyproject/key/api/SimpleClient.java
@@ -0,0 +1,38 @@
+/* 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 org.keyproject.key.api.remoteclient.*;
+
+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 13b6f11f742a33de4cd0cc12beb74af75d5c1f5f 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/35] wip

---
 .../org/keyproject/key/api/StartServer.java   | 213 ++++++++++++++++++
 .../keyproject/key/api/remoteapi/EnvId.java   |  11 +
 .../key/api/remoteapi/LoadParams.java         |  12 +
 .../api/remoteclient/LogMessageParams.java    |  17 ++
 .../key/api/remoteclient/LogTraceParams.java  |  20 ++
 .../api/remoteclient/MessageActionItem.java   |  11 +
 .../key/api/remoteclient/MessageType.java     |  31 +++
 .../api/remoteclient/ShowDocumentParams.java  |  37 +++
 .../api/remoteclient/ShowDocumentResult.java  |  12 +
 .../api/remoteclient/ShowMessageParams.java   |  17 ++
 .../ShowMessageRequestParams.java             |  22 ++
 keyext.api/src/main/python/keyapi/rpc.py      |  76 +++++++
 keyext.api/src/main/python/main.py            |  13 ++
 13 files changed, 492 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..246181ebc43
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
@@ -0,0 +1,213 @@
+/* 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.Collection;
+import java.util.Collections;
+import java.util.List;
+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;
+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;
+
+/**
+ * @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..52d4569aa3f
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
@@ -0,0 +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;
+
+/**
+ * @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..c22064a856a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
@@ -0,0 +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.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..a399c097d2a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogMessageParams.java
@@ -0,0 +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.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..a9f9bde6315
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/LogTraceParams.java
@@ -0,0 +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.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) {
+
+}
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..e6948bf3dec
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageActionItem.java
@@ -0,0 +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.remoteclient;
+
+public record MessageActionItem(
+        /**
+         * A short title like 'Retry', 'Open Log' etc.
+         */
+        String title) {
+}
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..8564f136f36
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/MessageType.java
@@ -0,0 +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
+}
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..919ed5b645d
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentParams.java
@@ -0,0 +1,37 @@
+/* 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;
+
+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..616a0332897
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowDocumentResult.java
@@ -0,0 +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.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..5b0a6fc0286
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageParams.java
@@ -0,0 +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.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..1e893bbe067
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/ShowMessageRequestParams.java
@@ -0,0 +1,22 @@
+/* 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 ShowMessageRequestParams(
+        /**
+         * The message type. See {@link MessageType}
+         */
+        MessageType type,
+
+        /**
+         * The actual message
+         */
+        String message,
+
+        /**
+         * The message action items to present.
+         *
+         */
+        MessageActionItem[] actions) {
+}
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 ffe5b002cbfeaacc27868765b14a461bb177af80 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/35] Creating an JSON-RPC API

# Conflicts:
#	keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
#	keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.java
#	keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
#	keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
#	keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
#	keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java

# Conflicts:
#	key.core/src/main/java/de/uka/ilkd/key/proof/Proof.java
---
 .../java/de/uka/ilkd/key/Identifiable.java    |  14 ++
 .../uka/ilkd/key/control/KeYEnvironment.java  |  39 ++++
 .../main/java/de/uka/ilkd/key/proof/Goal.java |  42 +++++
 .../java/de/uka/ilkd/key/proof/Proof.java     |  14 +-
 .../de/uka/ilkd/key/gui/ExampleChooser.java   |   2 +-
 keyext.api.doc/build.gradle                   |   4 +
 .../src/main/java/ExtractMetaData.java        | 167 +++++++++++++++++
 keyext.api/build.gradle                       |   3 +
 .../org/keyproject/key/api/KeyApiImpl.java    | 174 ++++++++++++++++++
 .../org/keyproject/key/api/StartServer.java   |  61 +-----
 .../key/api/adapters/KeyAdapter.java          | 104 +++++++++++
 .../key/api/adapters/package-info.java        |   7 +
 .../keyproject/key/api/data/ContractDesc.java |  11 ++
 .../keyproject/key/api/data/FunctionDesc.java |  13 ++
 .../org/keyproject/key/api/data/GoalText.java |  13 ++
 .../keyproject/key/api/data/LoadParams.java   |  19 ++
 .../{remoteapi => data}/MacroDescription.java |   8 +-
 .../key/api/data/MacroStatistic.java          |  11 ++
 .../org/keyproject/key/api/data/NodeDesc.java |  11 ++
 .../key/api/data/PredicateDesc.java           |  11 ++
 .../org/keyproject/key/api/data/PrintId.java  |  11 ++
 .../key/api/data/ProblemDefinition.java       |  20 ++
 .../keyproject/key/api/data/ProofLoading.java |  47 +++++
 .../org/keyproject/key/api/data/SortDesc.java |  11 ++
 .../key/api/data/StreategyOptions.java        |  11 ++
 .../keyproject/key/api/data/TermAction.java   |  11 ++
 .../keyproject/key/api/data/TermActionId.java |  11 ++
 .../api/{remoteapi => data}/TraceValue.java   |   2 +-
 .../keyproject/key/api/data/TreeNodeDesc.java |  11 ++
 .../keyproject/key/api/data/TreeNodeId.java   |  11 ++
 .../keyproject/key/api/remoteapi/EnvApi.java  |  35 ++++
 .../{KeyExampleApi.java => ExampleApi.java}   |   2 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |  36 ++++
 .../keyproject/key/api/remoteapi/KeyApi.java  |  65 +------
 .../{KeyMetaApi.java => MetaApi.java}         |  11 +-
 .../key/api/remoteapi/ProofApi.java           |  53 ++++++
 .../key/api/remoteapi/ProofTreeApi.java       |  30 +++
 .../key/api/remoteapi/ServerManagement.java   |  70 +++++++
 .../key/api/remoteclient/ClientApi.java       |   2 +-
 .../org/keyproject/key/api/SimpleClient.java  |   2 +-
 .../key/api/{Client.java => TestRpc.java}     |  46 ++++-
 settings.gradle                               |   1 +
 42 files changed, 1090 insertions(+), 137 deletions(-)
 create mode 100644 key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
 create mode 100644 keyext.api.doc/build.gradle
 create mode 100644 keyext.api.doc/src/main/java/ExtractMetaData.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 (80%)
 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 (83%)
 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
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyExampleApi.java => ExampleApi.java} (94%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
 rename keyext.api/src/main/java/org/keyproject/key/api/remoteapi/{KeyMetaApi.java => MetaApi.java} (71%)
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.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} (59%)

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..946fadb694a
--- /dev/null
+++ b/key.core/src/main/java/de/uka/ilkd/key/Identifiable.java
@@ -0,0 +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 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/KeYEnvironment.java b/key.core/src/main/java/de/uka/ilkd/key/control/KeYEnvironment.java
index 74e7e5c33b7..e04d06c3a37 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
@@ -333,6 +333,45 @@ public boolean isDisposed() {
         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;
+    }
+
+
     /**
      * constructs the possible proof contracts from the java info in the environment.
      */
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 f9f410bd843..6559425729c 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
@@ -13,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.rule.AbstractExternalSolverRuleApp;
@@ -23,6 +24,7 @@
 import de.uka.ilkd.key.rule.merge.MergeRule;
 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;
@@ -753,6 +755,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();
@@ -777,4 +786,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 a6f5cab1498..1859a048d1e 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,10 +11,10 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+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.JTerm;
-import de.uka.ilkd.key.logic.NamespaceSet;
+import de.uka.ilkd.key.logic.*;
 import de.uka.ilkd.key.pp.AbbrevMap;
 import de.uka.ilkd.key.proof.calculus.JavaDLSequentKit;
 import de.uka.ilkd.key.proof.event.ProofDisposedEvent;
@@ -58,7 +58,7 @@
  * goals, namespaces and several other information about the current state of the proof.
  */
 @NullMarked
-public class Proof implements ProofObject<Goal>, Named {
+public class Proof implements ProofObject<Goal>, Named, Identifiable {
 
     /**
      * The time when the {@link Proof} instance was created.
@@ -1380,4 +1380,12 @@ public void printSymbols(PrintWriter ps) {
     public long getCreationTime() {
         return creationTime;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String identification() {
+        return getClass().getName() + "_" + name + "_" + hashCode();
+    }
 }
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 02505ac383e..4df6d2a0c39 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
@@ -313,7 +313,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..07106c02d9f
--- /dev/null
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -0,0 +1,167 @@
+/* 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.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;
+import javax.annotation.Nonnull;
+
+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.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;
+
+/**
+ * @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 c1805081940..0ddb34926e0 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/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
new file mode 100644
index 00000000000..bc9c24b5e5a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
@@ -0,0 +1,174 @@
+/* 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.List;
+import java.util.concurrent.CompletableFuture;
+
+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;
+
+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 246181ebc43..0a7531097e9 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,16 +8,13 @@
 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;
 import javax.annotation.Nullable;
 
 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;
@@ -32,6 +29,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;
@@ -60,7 +59,7 @@ public class StartServer implements Runnable {
     boolean helpRequested = false;
 
     @Option(names = "--websocket")
-    boolean websocket;
+    boolean websocket = false;
     // endregion
 
     public static void main(String[] args) {
@@ -120,29 +119,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>()
@@ -151,7 +127,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 {
@@ -167,8 +143,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) {
@@ -181,33 +158,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..af874cda8b5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/adapters/KeyAdapter.java
@@ -0,0 +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.keyproject.key.api.adapters;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Type;
+
+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.proof.Proof;
+
+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 org.keyproject.key.api.data.MacroDescription;
+
+/**
+ * @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..522f32d9b3b
--- /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;
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..d17a8bad65c
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
@@ -0,0 +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.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..cbd2c547182
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/FunctionDesc.java
@@ -0,0 +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 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..b4269ac1505
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
@@ -0,0 +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 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..41e9341585e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/LoadParams.java
@@ -0,0 +1,19 @@
+/* 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.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 80%
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 95084b3716d..fc2a8ba0e95 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,10 +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.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..c9a0b98ad44
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/MacroStatistic.java
@@ -0,0 +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.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..ba90e14ff72
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeDesc.java
@@ -0,0 +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.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..dbb0e899496
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PredicateDesc.java
@@ -0,0 +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.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..895ca1b0979
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
@@ -0,0 +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.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..427e4751646
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProblemDefinition.java
@@ -0,0 +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 java.util.List;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * @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..dc8e199a77a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofLoading.java
@@ -0,0 +1,47 @@
+/* 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.util.concurrent.CompletableFuture;
+
+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;
+
+/**
+ * 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;
+}
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..7c0a99e5a17
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/SortDesc.java
@@ -0,0 +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.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..ea804f0562b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/StreategyOptions.java
@@ -0,0 +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.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..3b5149d275f
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.java
@@ -0,0 +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.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..cdf2d63ba92
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.java
@@ -0,0 +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.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 83%
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 11a082303f0..99a258f79d4 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,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;
 
 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..7f8509df70c
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeDesc.java
@@ -0,0 +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.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..c476521fa1a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.java
@@ -0,0 +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.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..5d61e479c3a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvApi.java
@@ -0,0 +1,35 @@
+/* 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.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;
+
+/**
+ * @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/KeyExampleApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleApi.java
similarity index 94%
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 9f91e82baa0..6da9c2f556b 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
@@ -12,7 +12,7 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
 @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..46eccd412fe
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/GoalApi.java
@@ -0,0 +1,36 @@
+/* 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.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;
+
+/**
+ * @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 21c3400574d..7f269f0eceb 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,64 +3,9 @@
  * 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;
-
-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/KeyMetaApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/MetaApi.java
similarity index 71%
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 3a1a027f233..5a0454d8b93 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
@@ -6,19 +6,20 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+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;
 
 @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..93089544d7b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofApi.java
@@ -0,0 +1,53 @@
+/* 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.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;
+
+/**
+ * @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/ProofTreeApi.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
new file mode 100644
index 00000000000..162aa884c87
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofTreeApi.java
@@ -0,0 +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 org.keyproject.key.api.remoteapi;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+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;
+
+/**
+ * @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..b593d0ed66b
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ServerManagement.java
@@ -0,0 +1,70 @@
+/* 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;
+
+/**
+ * @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 3bbf856af3d..9dc420279d3 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
@@ -10,7 +10,7 @@
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
-@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 6e92beff41c..bba9b06d709 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
@@ -21,7 +21,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 59%
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 5ff2d0725f4..9c21634adae 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
@@ -9,19 +9,25 @@
 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;
 
 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 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();
@@ -45,13 +51,33 @@ public static void main(String[] args)
         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 8be9e773bee..f17504647e7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,6 +31,7 @@ include "keyext.caching"
 include "keyext.isabelletranslation"
 
 include 'keyext.api'
+include 'keyext.api.doc'
 
 // ENABLE NULLNESS here or on the CLI
 // This flag is activated to enable the checker framework.

From ab3ca5e648f4601c033ad39ce65e8bd25dfb30fe 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/35] working on a working minimal version

---
 .../src/main/java/org/key_project/Main.java   |   4 +-
 .../key/control/AbstractProofControl.java     |  14 +-
 .../de/uka/ilkd/key/control/ProofControl.java |  11 +-
 .../ilkd/key/macros/ProofMacroListener.java   |   2 +-
 .../main/java/de/uka/ilkd/key/proof/Node.java |   6 +
 .../uka/ilkd/key/gui/ProofScriptWorker.java   |   7 +
 .../org/keyproject/key/api/KeyApiImpl.java    | 505 ++++++++++++++++--
 .../org/keyproject/key/api/NodeTextDesc.java  |  11 +
 .../org/keyproject/key/api/NodeTextId.java    |  13 +
 .../org/keyproject/key/api/StartServer.java   |  16 +-
 .../keyproject/key/api/TermActionUtil.java    | 134 +++++
 .../key/api/adapters/KeyAdapter.java          |  79 ++-
 .../keyproject/key/api/data/ContractDesc.java |  13 +-
 .../keyproject/key/api/data/FunctionDesc.java |  14 +-
 .../key/api/data/KeyIdentifications.java      | 171 ++++++
 .../key/api/data/MacroStatistic.java          |  11 +-
 .../org/keyproject/key/api/data/NodeDesc.java |  13 +-
 .../key/api/data/ProofMacroDesc.java          |  18 +
 .../key/api/data/ProofScriptCommandDesc.java  |  16 +
 .../org/keyproject/key/api/data/SortDesc.java |  13 +-
 .../key/api/data/TermActionDesc.java          |  15 +
 .../keyproject/key/api/data/TermActionId.java |   7 -
 .../key/api/data/TermActionKind.java          |  12 +
 .../keyproject/key/api/data/TreeNodeId.java   |   7 -
 .../keyproject/key/api/internal/NodeText.java |  13 +
 .../keyproject/key/api/remoteapi/EnvApi.java  |  17 +-
 .../keyproject/key/api/remoteapi/GoalApi.java |  21 +-
 .../keyproject/key/api/remoteapi/KeyApi.java  |   4 +-
 .../keyproject/key/api/remoteapi/MetaApi.java |  10 +-
 .../key/api/remoteapi/PrintOptions.java       |  12 +
 .../key/api/remoteapi/ProofApi.java           |  27 +-
 .../ProofLoadApi.java}                        |  27 +-
 .../key/api/remoteapi/ProofTreeApi.java       |  14 +-
 .../key/api/remoteclient/ClientApi.java       |  11 +-
 .../org/keyproject/key/api/SimpleClient.java  |  18 +
 .../java/org/keyproject/key/api/TestRpc.java  |   7 +-
 36 files changed, 1096 insertions(+), 197 deletions(-)
 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
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.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
 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} (54%)

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 a1b583c7be3..39f0f1a958a 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
@@ -97,6 +97,7 @@ private static void proveEnvironmemt(KeYEnvironment<?> env) {
                 LOGGER.info("Found contract '" + contract.getDisplayName());
                 proveContract(env, contract);
             }
+        } catch (InterruptedException ignored) {
         } finally {
             env.dispose(); // Ensure always that all instances of KeYEnvironment are disposed
         }
@@ -135,7 +136,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) {
+    private static void proveContract(KeYEnvironment<?> env, Contract contract)
+            throws InterruptedException {
         Proof proof = null;
         try {
             // Create proof
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 535d6032acd..a7b0efc7b2b 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
@@ -571,19 +571,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();
     }
@@ -592,7 +585,8 @@ 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();
     }
@@ -601,7 +595,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/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index c85a86d0f24..375939e4e44 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
@@ -126,7 +126,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.
@@ -146,13 +146,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
@@ -161,7 +161,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);
+    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
@@ -169,7 +170,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/ProofMacroListener.java b/key.core/src/main/java/de/uka/ilkd/key/macros/ProofMacroListener.java
index 1e1d871c1ec..efeed331615 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
@@ -36,7 +36,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 93c58da43ce..74f85592bbe 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;
@@ -12,6 +13,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.op.IProgramVariable;
@@ -838,4 +840,8 @@ public int getStepIndex() {
     void setStepIndex(int stepIndex) {
         this.stepIndex = stepIndex;
     }
+
+    public Stream<Node> childrenStream() {
+        return children.stream();
+    }
 }
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 ccb6b52727a..7fd88c78a74 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
@@ -163,6 +163,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/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index bc9c24b5e5a..c94607260fa 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,29 +3,78 @@
  * 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;
 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.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.keyproject.key.api.adapters.KeyAdapter;
 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;
-
-public record KeyApiImpl(KeyAdapter adapter) implements KeyApi {
+import org.keyproject.key.api.remoteapi.PrintOptions;
+import org.keyproject.key.api.remoteclient.ClientApi;
+
+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
@@ -54,121 +103,479 @@ 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,
+    public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLine,
             StreategyOptions options) {
-        return null;
+        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,
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId,
             StreategyOptions options) {
-        return null;
+        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..a7d9585c719
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
@@ -0,0 +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;
+
+/**
+ * @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..7e956689c08
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/NodeTextId.java
@@ -0,0 +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;
+
+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 0a7531097e9..eefa000ac8c 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
@@ -120,6 +120,8 @@ public void run() {
         }
 
         try {
+            final var keyApi = new KeyApiImpl();
+
             if (websocket) {
                 var launcherBuilder = new WebSocketLauncherBuilder<ClientApi>()
                         .setOutput(out)
@@ -127,14 +129,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();
                 }
             }
@@ -148,7 +154,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>()
@@ -159,7 +165,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..3ac97bdc3d5
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
@@ -0,0 +1,134 @@
+/* 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;
+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.key_project.util.collection.ImmutableList;
+import org.key_project.util.collection.ImmutableSLList;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.keyproject.key.api.data.KeyIdentifications;
+import org.keyproject.key.api.data.TermActionDesc;
+import org.keyproject.key.api.data.TermActionKind;
+
+/**
+ * @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 af874cda8b5..77ab08d832a 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
@@ -5,16 +5,11 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Type;
 
-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.proof.Proof;
 
-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;
@@ -25,33 +20,32 @@
  * @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) {
-        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
+    /*
+     * //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
+     */
 
-    class MacroTypeAdapter implements JsonSerializer<ProofMacro> {
+    static class MacroSerializer implements JsonSerializer<ProofMacro> {
         @Override
         public JsonElement serialize(ProofMacro src, Type typeOfSrc,
                 JsonSerializationContext context) {
@@ -59,7 +53,7 @@ public JsonElement serialize(ProofMacro src, Type typeOfSrc,
         }
     }
 
-    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());
@@ -71,7 +65,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) {
@@ -86,19 +80,22 @@ public JsonElement serialize(Function src, Type typeOfSrc,
         }
     }
 
-    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/data/ContractDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ContractDesc.java
index d17a8bad65c..1865f01685d 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
@@ -3,9 +3,20 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 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 cbd2c547182..df3e8f285ef 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,9 +5,21 @@
 
 import java.util.List;
 
+import de.uka.ilkd.key.logic.op.Function;
+
 /**
  * @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/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
new file mode 100644
index 00000000000..83fb93bd517
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
@@ -0,0 +1,171 @@
+/* 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.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.checkerframework.checker.nullness.qual.NonNull;
+import org.keyproject.key.api.NodeTextId;
+import org.keyproject.key.api.internal.NodeText;
+
+/**
+ * @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 c9a0b98ad44..50cd735bd82 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
@@ -3,9 +3,18 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 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 ba90e14ff72..44941cb8dfd 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
@@ -3,9 +3,20 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import java.util.List;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * @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/ProofMacroDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
new file mode 100644
index 00000000000..56fba7086c6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofMacroDesc.java
@@ -0,0 +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.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..0f086d8f936
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofScriptCommandDesc.java
@@ -0,0 +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.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 7c0a99e5a17..dbb45fa68c8 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
@@ -3,9 +3,20 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+import java.util.List;
+
+import de.uka.ilkd.key.logic.sort.Sort;
+
 /**
  * @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/TermActionDesc.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
new file mode 100644
index 00000000000..e3953a6c8bd
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionDesc.java
@@ -0,0 +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.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 cdf2d63ba92..4b61cb5bcee 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
@@ -2,10 +2,3 @@
  * 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 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..0a371aa48e4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionKind.java
@@ -0,0 +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;
+
+/**
+ * @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 c476521fa1a..4b61cb5bcee 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
@@ -2,10 +2,3 @@
  * 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 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..84898829e9a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/internal/NodeText.java
@@ -0,0 +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.internal;
+
+import de.uka.ilkd.key.pp.InitialPositionTable;
+
+/**
+ * @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 5d61e479c3a..c70fe8a15d2 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
@@ -3,16 +3,11 @@
  * 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.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;
 
 /**
@@ -22,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 46eccd412fe..e072f01cf82 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,18 +3,13 @@
  * 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.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.*;
 
 /**
  * @author Alexander Weigl
@@ -23,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 7f269f0eceb..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
@@ -6,6 +6,6 @@
 /**
  * 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 5a0454d8b93..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
@@ -6,11 +6,11 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-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.KeyIdentifications.*;
+import org.keyproject.key.api.data.ProofMacroDesc;
+import org.keyproject.key.api.data.ProofScriptCommandDesc;
 
 @JsonSegment("meta")
 public interface MetaApi {
@@ -18,8 +18,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..845c485ca7e
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/PrintOptions.java
@@ -0,0 +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.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 93089544d7b..80131fa143c 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
@@ -3,14 +3,10 @@
  * 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.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;
@@ -21,33 +17,34 @@
  */
 public interface ProofApi {
     @JsonRequest
-    CompletableFuture<MacroStatistic> script(Proof proof, String scriptLine,
+    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 54%
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 dc8e199a77a..2b5f5e78187 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,16 +1,19 @@
 /* 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;
+package org.keyproject.key.api.remoteapi;
 
 import java.util.concurrent.CompletableFuture;
 
-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.EnvironmentId;
+import org.keyproject.key.api.data.KeyIdentifications.ProofId;
+import org.keyproject.key.api.data.LoadParams;
+import org.keyproject.key.api.data.ProblemDefinition;
 
 /**
  * Functionalities for loading proofs either from a built-in example, or from a set of files.
@@ -19,7 +22,7 @@
  * @since v1
  */
 @JsonSegment("loading")
-public interface ProofLoading {
+public interface ProofLoadApi {
     /**
      * I am not sure whether this is helpful. Mainly a feature for testing?!
      *
@@ -27,13 +30,22 @@ public interface ProofLoading {
      * @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!
@@ -43,5 +55,6 @@ 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;
 }
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 162aa884c87..459adfce637 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
@@ -3,15 +3,11 @@
  * 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.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;
 
 /**
  * @author Alexander Weigl
@@ -20,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 9dc420279d3..9d5159cb901 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
@@ -3,8 +3,8 @@
  * 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;
@@ -72,5 +72,12 @@ 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 bba9b06d709..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
@@ -6,6 +6,9 @@
 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.*;
 
 class SimpleClient implements ClientApi {
@@ -35,4 +38,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 9c21634adae..5ebb562d474 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
@@ -19,6 +19,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;
 
@@ -27,7 +28,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();
@@ -36,7 +37,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>()

From 1178d46db7148a3716503f9962175e01382553d8 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/35] more doc and py generation

---
 api.meta.json                                 | 1144 +++++++++++++++++
 api.meta.md                                   |  480 +++++++
 api.py                                        |  374 ++++++
 keyext.api.doc/build.gradle                   |    1 +
 keyext.api.doc/src/main/java/DocGen.java      |  190 +++
 .../src/main/java/ExtractMetaData.java        |  364 ++++--
 keyext.api.doc/src/main/java/Metamodel.java   |  100 ++
 keyext.api.doc/src/main/java/PyGen.java       |  145 +++
 keyext.api/build.gradle                       |    6 +-
 .../org/keyproject/key/api/KeyApiImpl.java    |   15 +-
 .../org/keyproject/key/api/NodeTextId.java    |    9 -
 .../keyproject/key/api/TermActionUtil.java    |    2 +
 .../key/api/data/KeyIdentifications.java      |    6 +-
 .../org/keyproject/key/api/data/NodeDesc.java |    4 +-
 .../keyproject/key/api/data/NodeTextDesc.java |   12 +
 .../key/api/data/ProblemDefinition.java       |    2 +
 .../key/api/remoteapi/ExampleApi.java         |    4 +-
 .../key/api/remoteapi/ExampleDesc.java        |   16 +
 .../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 ++++++
 26 files changed, 3343 insertions(+), 231 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
 create mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.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/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..8ab51393898
--- /dev/null
+++ b/keyext.api.doc/src/main/java/DocGen.java
@@ -0,0 +1,190 @@
+/* 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/ExtractMetaData.java b/keyext.api.doc/src/main/java/ExtractMetaData.java
index 07106c02d9f..16e3ffd2d56 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -1,27 +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 */
-import java.io.FileWriter;
+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 javax.annotation.Nonnull;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
-import com.github.javaparser.ParseResult;
+import de.uka.ilkd.key.proof.Proof;
+
+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.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 com.google.gson.*;
+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;
 
 /**
  * @author Alexander Weigl
@@ -30,138 +34,270 @@
 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();
+    }
+
+    private static void addServerEndpoint(Method method) {
+        var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
+        if (jsonSegment == null)
+            return;
+        var segment = jsonSegment.value();
+
+        var req = method.getAnnotation(JsonRequest.class);
+        var resp = method.getAnnotation(JsonNotification.class);
 
-        for (MethodDeclaration method : typeDeclaration.getMethods()) {
-            if (!isExported(method))
-                continue;
+        var args = translate(method.getParameters());
 
-            String callName = getCallName(method, typeDeclaration);
+        if (req != null) {
+            var mn = callMethodName(method.getName(), segment, req.value(), req.useSegment());
 
-            out.format("### %s (type: %s) %n%n", callName, type(method));
+            if (method.getReturnType() == Void.class) {
+                System.err.println("Found void as return type for a request!  " + method);
+                return;
+            }
 
-            out.println(getJavaDoc(method));
+            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;
+        }
 
-            out.println();
+        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..6d6ed916c6e
--- /dev/null
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -0,0 +1,100 @@
+/* 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)
+ */
+@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..02cec8af7a6
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PyGen.java
@@ -0,0 +1,145 @@
+/* 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;
+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));
+    }
+}
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index 0ddb34926e0..d2fdca4e9be 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 c94607260fa..fc165efa767 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
@@ -16,7 +16,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;
@@ -47,6 +46,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;
@@ -78,14 +78,15 @@ public KeyApiImpl() {
 
     @Override
     @JsonRequest
-    public CompletableFuture<List<Example>> examples() {
+    public CompletableFuture<List<ExampleDesc>> examples() {
         return CompletableFutures
-                .computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples()));
+                .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
@@ -215,10 +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();
         return new NodeDesc(new NodeId(proofId, root.serialNr()),
             root.getNodeInfo().getBranchLabel(),
             root.getNodeInfo().getScriptRuleApplication(),
-            root.childrenStream().map(it -> asNodeDescRecursive(proofId, it)).toList());
+            list);
     }
 
     @Override
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 7e956689c08..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
@@ -2,12 +2,3 @@
  * 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;
-
-/**
- * @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 3ac97bdc3d5..fe0e9f2f182 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
@@ -21,7 +21,9 @@
 import org.key_project.util.collection.ImmutableSLList;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
+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;
 
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 83fb93bd517..c474050a00a 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
@@ -13,6 +13,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.NodeTextId;
 import org.keyproject.key.api.internal.NodeText;
 
@@ -118,11 +119,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 44941cb8dfd..bba069cc757 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
@@ -6,12 +6,14 @@
 import java.util.List;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @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) {
     public NodeDesc(KeyIdentifications.ProofId proofId, int serialNr, String branchLabel,
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..4bd7d186a58
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/NodeTextDesc.java
@@ -0,0 +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;
+
+
+/**
+ * @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 427e4751646..a6b6fb2765b 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
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.data;
 
+
 import java.util.List;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Alexander Weigl
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 6da9c2f556b..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
@@ -6,13 +6,11 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import de.uka.ilkd.key.gui.Example;
-
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
 @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..e2f00758a72
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ExampleDesc.java
@@ -0,0 +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.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 e072f01cf82..be120b488de 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
@@ -6,10 +6,9 @@
 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.*;
 import org.keyproject.key.api.data.KeyIdentifications.*;
+import org.keyproject.key.api.data.NodeTextDesc;
 
 /**
  * @author Alexander Weigl
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 b593d0ed66b..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
@@ -38,7 +38,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 5ebb562d474..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
@@ -10,7 +10,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;
 
@@ -19,7 +18,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;
 
@@ -37,7 +35,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());
 
@@ -61,7 +59,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 51aeccbd7d951d675a659667eecb48abb8b6d773 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/35] 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        |  24 +-
 keyext.api.doc/src/main/java/Metamodel.java   |   7 +-
 .../src/main/java/PythionGenerator.java       | 230 ++++++++
 keyext.api/build.gradle                       |   1 +
 .../keyproject/key/api/GenericSerializer.java |  61 ++
 .../org/keyproject/key/api/KeyApiImpl.java    |   2 +-
 .../org/keyproject/key/api/StartServer.java   |   6 +-
 .../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 ++++++
 20 files changed, 2033 insertions(+), 1016 deletions(-)
 delete mode 100644 api.py
 create mode 100644 keydata.py
 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 16e3ffd2d56..d053b9268d3 100644
--- a/keyext.api.doc/src/main/java/ExtractMetaData.java
+++ b/keyext.api.doc/src/main/java/ExtractMetaData.java
@@ -10,6 +10,8 @@
 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;
 
@@ -47,21 +49,17 @@ 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();
         }
diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index 6d6ed916c6e..db639174e71 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -47,10 +47,13 @@ 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/PythionGenerator.java b/keyext.api.doc/src/main/java/PythionGenerator.java
new file mode 100644
index 00000000000..47faabfc131
--- /dev/null
+++ b/keyext.api.doc/src/main/java/PythionGenerator.java
@@ -0,0 +1,230 @@
+/* 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;
+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();
+        }
+    }
+}
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index d2fdca4e9be..bc997708b51 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..9082242ee37
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
@@ -0,0 +1,61 @@
+/* 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 = "$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 fc165efa767..f271fd4e614 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
@@ -81,7 +81,7 @@ public KeyApiImpl() {
     public CompletableFuture<List<ExampleDesc>> examples() {
         return CompletableFutures
                 .computeAsync((c) -> ExampleChooser.listExamples(ExampleChooser.lookForExamples())
-                        .stream().map(it -> ExampleDesc.from(it)).toList());
+                        .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 eefa000ac8c..9cbfeb7ac70 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
@@ -29,8 +29,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;
@@ -151,7 +149,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) {
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 77ab08d832a..ecd1e93371b 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
@@ -53,7 +53,7 @@ public JsonElement serialize(ProofMacro src, Type typeOfSrc,
         }
     }
 
-    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 1e893bbe067..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
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 package org.keyproject.key.api.remoteclient;
 
+import java.util.List;
+
 public record ShowMessageRequestParams(
         /**
          * The message type. See {@link MessageType}
@@ -18,5 +20,5 @@ public record ShowMessageRequestParams(
          * The message action items to present.
          *
          */
-        MessageActionItem[] actions) {
+        List<MessageActionItem> actions) {
 }
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 e89f9eb7ff4b78a9142a96bbd2979b6b4d221239 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/35] add throwable adapter

---
 .../org/keyproject/key/api/StartServer.java   |  2 +-
 .../key/api/adapters/KeyAdapter.java          | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

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 9cbfeb7ac70..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
@@ -151,7 +151,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 ecd1e93371b..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
@@ -80,19 +80,31 @@ public JsonElement serialize(Function src, Type typeOfSrc,
         }
     }
 
+    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 {
+     * 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) {
+     * public JsonElement serialize(Identifiable src, Type typeOfSrc, JsonSerializationContext
+     * context) {
      * insert(src);
      * return context.serialize(src.identification());
      * }

From 47f6efeec3b8db47379c7ce74f814ffdd7cd7d4a 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/35] spotless and merge errors

---
 keyext.api.doc/src/main/java/Metamodel.java   | 19 +++++++++++++++++--
 .../keyproject/key/api/TermActionUtil.java    |  1 -
 .../key/api/data/KeyIdentifications.java      |  2 --
 .../key/api/data/MacroStatistic.java          |  7 +++----
 .../org/keyproject/key/api/data/NodeDesc.java |  1 -
 .../key/api/data/ProblemDefinition.java       |  1 -
 .../keyproject/key/api/remoteapi/EnvApi.java  |  3 +++
 .../keyproject/key/api/remoteapi/GoalApi.java |  3 +++
 .../key/api/remoteapi/ProofApi.java           |  3 +++
 .../key/api/remoteapi/ProofTreeApi.java       |  3 +++
 .../key/api/remoteclient/ClientApi.java       |  3 +++
 .../ilkd/key/gui/testgen/TGInfoDialog.java    |  9 ++++++---
 12 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/keyext.api.doc/src/main/java/Metamodel.java b/keyext.api.doc/src/main/java/Metamodel.java
index db639174e71..f4afddc14e6 100644
--- a/keyext.api.doc/src/main/java/Metamodel.java
+++ b/keyext.api.doc/src/main/java/Metamodel.java
@@ -16,7 +16,9 @@ public record KeyApi(
             List<Type> types) {
     }
 
-    sealed interface Endpoint {
+    sealed
+
+    interface Endpoint {
         String name();
 
         String documentation();
@@ -48,12 +50,16 @@ record ClientNotification(String name, String documentation, List<Argument> args
     }
 
     record Field(String name, /* Type */ String type, String documentation) {
+
         Field(String name, String type) {
             this(name, type, "");
         }
     }
 
-    public sealed interface Type {
+    public sealed
+
+
+    interface Type {
         default String kind() {
             return getClass().getSimpleName();
         }
@@ -63,6 +69,7 @@ default String kind() {
         String name();
     }
 
+
     enum BuiltinType implements Type {
         INT, LONG, STRING, BOOL, DOUBLE;
 
@@ -70,31 +77,39 @@ enum BuiltinType implements Type {
         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/src/main/java/org/keyproject/key/api/TermActionUtil.java b/keyext.api/src/main/java/org/keyproject/key/api/TermActionUtil.java
index fe0e9f2f182..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
@@ -20,7 +20,6 @@
 import org.key_project.util.collection.ImmutableList;
 import org.key_project.util.collection.ImmutableSLList;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jspecify.annotations.NonNull;
 import org.keyproject.key.api.data.KeyIdentifications;
 import org.keyproject.key.api.data.KeyIdentifications.NodeTextId;
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 c474050a00a..cbb5e21f12d 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
@@ -12,9 +12,7 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jspecify.annotations.NonNull;
-import org.keyproject.key.api.NodeTextId;
 import org.keyproject.key.api.internal.NodeText;
 
 /**
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 50cd735bd82..06aa618634d 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
@@ -9,12 +9,11 @@
  * @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 bba069cc757..5c72cfec2c9 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
@@ -5,7 +5,6 @@
 
 import java.util.List;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jspecify.annotations.Nullable;
 
 /**
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 a6b6fb2765b..0eafbefcf89 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
@@ -6,7 +6,6 @@
 
 import java.util.List;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jspecify.annotations.Nullable;
 
 /**
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 c70fe8a15d2..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
@@ -3,6 +3,9 @@
  * 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;
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 be120b488de..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
@@ -3,6 +3,9 @@
  * 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;
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 80131fa143c..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
@@ -3,6 +3,9 @@
  * 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;
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 459adfce637..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
@@ -3,6 +3,9 @@
  * 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;
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 9d5159cb901..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
@@ -3,6 +3,9 @@
  * 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;
 
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 af40c2d8c20..6fce99da565 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
@@ -37,9 +37,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 f37f26b288ac0a3cb5a146d602a5f7ac31956754 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Wed, 26 Jun 2024 16:11:29 +0200
Subject: [PATCH 10/35] fix after refactoring + spotless

---
 .../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 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

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 df3e8f285ef..c693a179524 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
@@ -15,7 +16,7 @@ public record FunctionDesc(String name, String sort, SortDesc retSort, List<Sort
         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 dbb45fa68c8..a13e03025da 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 c3cc7a6547739191a7843898ba94d30a79dd7a85 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 20 Oct 2024 16:12:52 +0200
Subject: [PATCH 11/35] wip

---
 keyext.api.doc/build.gradle                   |   4 +-
 keyext.api.doc/src/main/java/DocGen.java      | 190 ------------------
 .../org/key_project/key/api/doc/DocGen.java   | 117 +++++++++++
 .../key/api/doc}/ExtractMetaData.java         | 166 ++++++++-------
 .../key_project/key/api/doc}/Metamodel.java   |   7 +
 .../key/api/doc/PythonGenerator.java}         |  25 ++-
 .../org/keyproject/key/api/KeyApiImpl.java    |  14 +-
 .../key/api/data/TermActionDesc.java          |  22 +-
 .../keyproject/key/api/data/package-info.java |   8 +
 .../org/keyproject/key/api/package-info.java  |   8 +
 .../key/api/remoteapi/package-info.java       |   8 +
 .../key/api/remoteclient/package-info.java    |   8 +
 12 files changed, 292 insertions(+), 285 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 (63%)
 rename keyext.api.doc/src/main/java/{ => org/key_project/key/api/doc}/Metamodel.java (86%)
 rename keyext.api.doc/src/main/java/{PythionGenerator.java => org/key_project/key/api/doc/PythonGenerator.java} (91%)
 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/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..d793e0fa08a
--- /dev/null
+++ b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/DocGen.java
@@ -0,0 +1,117 @@
+/* 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;
+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 63%
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..86a9bb7e945 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,90 @@
 /* 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.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.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.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 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;
 
 /**
  * @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 +93,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,19 +115,16 @@ 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) {
+                .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;
@@ -118,28 +162,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,7 +226,7 @@ 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(),
@@ -194,34 +242,24 @@ 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,7 +286,7 @@ private static void addClientEndpoint(Method method) {
         }
     }
 
-    private static String callMethodName(String method, String segment, String userValue,
+    private static String callMethodName(String method, String segment, @Nullable String userValue,
             boolean useSegment) {
         if (!useSegment) {
             if (userValue == null || userValue.isBlank()) {
@@ -265,8 +303,8 @@ 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(),
@@ -286,16 +324,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 86%
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 f4afddc14e6..9762ee1f107 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,6 +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.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/PythionGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
similarity index 91%
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 47faabfc131..3b7c6447377 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,6 +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.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;
@@ -12,12 +19,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 +41,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,8 +63,7 @@ protected String asPython(Metamodel.Type t) {
 
         if (t instanceof Metamodel.BuiltinType bt) {
             return switch (bt) {
-                case INT -> "int";
-                case LONG -> "int";
+                case INT, LONG -> "int";
                 case STRING -> "str";
                 case BOOL -> "bool";
                 case DOUBLE -> "float";
@@ -73,7 +78,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 +128,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 +139,7 @@ class KeyServer(ServerBase):%n
                         def __init__(self, endpoint : LspEndpoint):
                             super().__init__(endpoint)
 
-                     """);
+                    """);
             sorted.forEach(this::serverEndpoint);
         }
 
@@ -169,7 +174,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 f271fd4e614..8de35f0197f 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 e3953a6c8bd..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,10 +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,
+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..39ecb9745a4
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked
+package org.keyproject.key.api.data;
+
+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
new file mode 100644
index 00000000000..c979030e065
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked
+package org.keyproject.key.api;
+
+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
new file mode 100644
index 00000000000..ccaca3e03b6
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked
+package org.keyproject.key.api.remoteapi;
+
+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
new file mode 100644
index 00000000000..2151dd10601
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/remoteclient/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Weigl
+ * @version 1 (20.10.24)
+ */
+@NullMarked
+package org.keyproject.key.api.remoteclient;
+
+import org.jspecify.annotations.NullMarked;

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

---
 .../org/key_project/key/api/doc/DocGen.java   |   4 +-
 keyext.api/build.gradle                       |  10 +-
 .../org/keyproject/key/api/StartServer.java   |   4 +-
 .../key/api/adapters/KeyAdapter.java          |   2 +-
 keyext.api/src/main/resources/logback.xml     |  59 ++++
 keyext.client.java/build.gradle               |  37 +++
 .../kit/iti/formal/keyextclientjava/Main.java |  27 ++
 .../formal/keyextclientjava/MyKeyClient.java  | 165 +++++++++++
 .../formal/keyextclientjava/TreeNodeId.java   |  11 +
 .../formal/keyextclientjava/rpc/JsonRPC.java  | 107 ++++++++
 .../keyextclientjava/rpc/KeyRemote.java       |  22 ++
 .../formal/keyextclientjava/rpc/RPCLayer.java | 258 ++++++++++++++++++
 .../formal/keyextclientjava/hello-view.fxml   |  16 ++
 .../edu/kit/keyext/client/RPCLayerTest.java   |  59 ++++
 .../java/edu/kit/keyext/client/Starter.java   |  25 ++
 settings.gradle                               |   1 +
 16 files changed, 799 insertions(+), 8 deletions(-)
 create mode 100644 keyext.api/src/main/resources/logback.xml
 create mode 100644 keyext.client.java/build.gradle
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.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/TreeNodeId.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
 create mode 100644 keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
 create mode 100644 keyext.client.java/src/main/resources/edu/kit/iti/formal/keyextclientjava/hello-view.fxml
 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.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 d793e0fa08a..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
@@ -75,9 +75,9 @@ private void endpoints(Metamodel.Endpoint endpoint) {
                 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 _ ->
+            case Metamodel.ServerNotification ignored ->
                 out.format("Server.%s( %s ) **async**%n", endpoint.name(), a);
-            case Metamodel.ClientNotification _ ->
+            case Metamodel.ClientNotification ignored ->
                 out.format("Client.%s( %s ) **async**%n", endpoint.name(), a);
             default -> {
             }
diff --git a/keyext.api/build.gradle b/keyext.api/build.gradle
index bc997708b51..08b6cbda804 100644
--- a/keyext.api/build.gradle
+++ b/keyext.api/build.gradle
@@ -9,13 +9,17 @@ plugins {
 
 description "Verification server interface via JSON-RPC"
 
+application {
+    mainClass.set("org.keyproject.key.api.StartServer")
+}
+
 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..ac90f8ad718 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.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
new file mode 100644
index 00000000000..50d4e4fcbc2
--- /dev/null
+++ b/keyext.client.java/build.gradle
@@ -0,0 +1,37 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'org.javamodularity.moduleplugin' version '1.8.12'
+    id 'org.openjfx.javafxplugin' version '0.1.0'
+}
+
+repositories {
+    mavenCentral()
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+application {
+    mainClass = 'edu.kit.iti.formal.keyextclientjava.Main'
+}
+
+javafx {
+    version = "23.0.2"
+    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')
+    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/Main.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
new file mode 100644
index 00000000000..1fb11b468d7
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/Main.java
@@ -0,0 +1,27 @@
+/* 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.scene.Scene;
+import javafx.scene.control.*;
+import javafx.stage.Stage;
+
+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) {
+        Application.launch(HelloApplication.class, args);
+    }
+}
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..39d87aec8f7
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/MyKeyClient.java
@@ -0,0 +1,165 @@
+/* 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 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;
+
+public class MyKeyClient {
+    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<Object> tnid = new TreeView<>();
+    private final TextArea txtSequentView = new TextArea();
+
+    private final FileChooser fc = new FileChooser();
+    private final KeyApi keyApi;
+    private KeyIdentifications.ProofId loadedProof;
+
+    public MyKeyClient() throws IOException {
+        // 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);
+
+        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 {
+        return new KeyRemote(RPCLayer.startWithCLI(JAR_FILE));
+    }
+
+    private void openFile() {
+        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/TreeNodeId.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
new file mode 100644
index 00000000000..d79f384505b
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/TreeNodeId.java
@@ -0,0 +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 edu.kit.iti.formal.keyextclientjava;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public record TreeNodeId() {
+}
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
new file mode 100644
index 00000000000..adb642c758c
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/JsonRPC.java
@@ -0,0 +1,107 @@
+/* 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.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\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/rpc/KeyRemote.java b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
new file mode 100644
index 00000000000..71c49088273
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/KeyRemote.java
@@ -0,0 +1,22 @@
+/* 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;
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (22.11.24)
+ */
+public class KeyRemote {
+    private final RPCLayer layer;
+
+    public KeyRemote(RPCLayer rpcLayer) {
+        this.layer = rpcLayer;
+    }
+
+    public String meta_version() {
+        final var obj = layer.callSync("meta/version");
+        return obj.get("result").getAsString();
+    }
+}
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
new file mode 100644
index 00000000000..569b8a091f9
--- /dev/null
+++ b/keyext.client.java/src/main/java/edu/kit/iti/formal/keyextclientjava/rpc/RPCLayer.java
@@ -0,0 +1,258 @@
+/* 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 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)
+ */
+public final class RPCLayer {
+    private final BufferedReader incoming;
+    private final Writer outgoing;
+
+    private @Nullable Thread threadListener;
+    private @Nullable Thread threadMessageHandling;
+
+    private final ConcurrentHashMap<String, SimpleFuture> waiting = new ConcurrentHashMap<>();
+    public final ArrayBlockingQueue<JsonObject> incomingMessages = new ArrayBlockingQueue<>(16);
+
+    private final AtomicInteger idCounter = new AtomicInteger();
+
+
+    public RPCLayer(Reader incoming, Writer outgoing) {
+        this.incoming = new BufferedReader(incoming);
+        this.outgoing = outgoing;
+    }
+
+    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);
+    }
+
+    public JsonObject waitForResponse(String id) throws InterruptedException, ExecutionException {
+        var cond = waiting.get(id);
+        var r = cond.get();
+        waiting.remove(id);
+        return r;
+    }
+
+    public JsonObject callSync(String methodName, Object... args) {
+        var id = nextId();
+        waiting.put(id, new SimpleFuture());
+        try {
+            sendAsync(id, methodName, args);
+            var response = waitForResponse(id);
+            return handleError(response);
+        } catch (InterruptedException | IOException | ExecutionException 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 {
+        var id = nextId();
+        sendAsync(id, methodName, args);
+    }
+
+    private String nextId() {
+        return "" + idCounter.getAndIncrement();
+    }
+
+    private void sendAsync(String id, String methodName, Object[] args) throws IOException {
+        var json = JsonRPC.createRequest(id, methodName, args);
+        final var str = JsonRPC.addHeader(json);
+        outgoing.write(str);
+        outgoing.flush();
+    }
+
+    public void start() {
+        threadListener =
+            new Thread(new JsonStreamListener(incoming, incomingMessages), "JSON Message Reader");
+        threadMessageHandling = new Thread(this::handler, "JSON Message Handler");
+        threadListener.start();
+        threadMessageHandling.start();
+    }
+
+    private void handler() {
+        try {
+            while (true) {
+                var obj = incomingMessages.poll(1, TimeUnit.MINUTES);
+                if (obj == null) {
+                    continue;
+                }
+                if (obj.get("id") != null) {
+                    var id = obj.get("id").getAsString();
+                    var syncObj = waiting.get(id);
+                    syncObj.put(obj);
+                } 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 PushbackReader 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 PushbackReader(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;
+            consumeCRNL();
+            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));
+                }
+            }
+        }
+
+        private void consumeCRNL() throws IOException {
+            int c = incoming.read();
+            if (c == '\r') {
+                c = incoming.read();
+                assert c == '\n';
+            } else {
+                incoming.unread(c);
+            }
+        }
+    }
+}
+
+
+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();
+    }
+
+}
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/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..bc5a309a8c6
--- /dev/null
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/RPCLayerTest.java
@@ -0,0 +1,59 @@
+/* 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 java.io.StringReader;
+import java.io.StringWriter;
+import java.util.concurrent.ArrayBlockingQueue;
+
+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;
+
+/**
+ * @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);
+    }
+}
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..9eeb893e163
--- /dev/null
+++ b/keyext.client.java/src/test/java/edu/kit/keyext/client/Starter.java
@@ -0,0 +1,25 @@
+/* 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;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.11.24)
+ */
+public class Starter {
+    @Test
+    void test() throws IOException {
+        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);
+        System.out.println(remote.meta_version());
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index f17504647e7..63d8382619a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -32,6 +32,7 @@ include "keyext.isabelletranslation"
 
 include 'keyext.api'
 include 'keyext.api.doc'
+include 'keyext.client.java'
 
 // ENABLE NULLNESS here or on the CLI
 // This flag is activated to enable the checker framework.

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

# Conflicts:
#	keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
---
 .../keyproject/key/api/GenericSerializer.java |  5 +-
 .../org/keyproject/key/api/KeyApiImpl.java    | 17 +++++-
 .../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 ++-
 8 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..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
@@ -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,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().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 8de35f0197f..f63c03942f3 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,8 @@ 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 +311,9 @@ 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 +470,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 ac90f8ad718..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
@@ -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..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
@@ -13,6 +13,7 @@
 
 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;
 
@@ -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 1865f01685d..b1eb59132f1 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
@@ -15,7 +15,7 @@ public record ContractDesc(KeyIdentifications.ContractId contractId, String name
         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 cbb5e21f12d..b681a01dac0 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 41e9341585e..fae51686bd0 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,6 +14,6 @@
  * @param bootClassPath
  * @param includes
  */
-public record LoadParams(File keyFile, File javaFile, List<File> classPath, File bootClassPath,
+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..11b9bb75f6d 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;
+
+
 /**
  * @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());
+    }
 }

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

---
 .../main/java/org/key_project/key/api/doc/ExtractMetaData.java | 3 ++-
 1 file changed, 2 insertions(+), 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..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();
+        throw new IllegalStateException(
+            "Method " + method + " is neither a request nor a notification");
     }
 
     private String findDocumentation(Method method) {

From b9ff3e79bafb4d4edc6e28f0cec30d61b445bf59 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Wed, 19 Feb 2025 15:12:12 +0100
Subject: [PATCH 15/35] 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 94d55ce972c9b9abcfbda27eee50fdd6e56068a1 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 10:00:27 +0100
Subject: [PATCH 16/35] Added proof api endpoint

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 18 +++--
 .../key/api/remoteapi/ProofApi.java           |  8 +-
 keyext.client.python/keyapi/keydata.py        | 79 +++++++++++++++----
 .../keyapi/server_internal.py                 | 45 +++++++++++
 keyext.client.python/main.py                  |  4 +-
 5 files changed, 125 insertions(+), 29 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 f63c03942f3..26835775b86 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
@@ -169,7 +169,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 +253,15 @@ 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) {
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..607d17eafac 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,9 +6,8 @@
 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;
@@ -18,6 +17,7 @@
  * @author Alexander Weigl
  * @version 1 (13.10.23)
  */
+@JsonSegment("proof")
 public interface ProofApi {
     @JsonRequest
     CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
@@ -48,6 +48,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 8b7bfbd675233c60fd0f37c40ed2cdcdd4c5cf0f Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 10:43:27 +0100
Subject: [PATCH 17/35] Attempt at reseting proof control

---
 .../uka/ilkd/key/control/AbstractProofControl.java | 14 ++++++++++----
 .../java/de/uka/ilkd/key/control/ProofControl.java | 11 +++++------
 .../de/uka/ilkd/key/gui/ProofScriptWorker.java     |  7 -------
 .../de/uka/ilkd/key/gui/testgen/TGInfoDialog.java  |  9 +++------
 4 files changed, 18 insertions(+), 23 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 a7b0efc7b2b..535d6032acd 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
@@ -571,12 +571,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();
     }
@@ -585,8 +592,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();
     }
@@ -595,7 +601,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/ProofControl.java b/key.core/src/main/java/de/uka/ilkd/key/control/ProofControl.java
index 375939e4e44..c85a86d0f24 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
@@ -126,7 +126,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.
@@ -146,13 +146,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
@@ -161,8 +161,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
@@ -170,7 +169,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 7fd88c78a74..ccb6b52727a 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
@@ -163,13 +163,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/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 6fce99da565..af40c2d8c20 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
@@ -37,12 +37,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 571ea42bbf201bb8820e2714a9c5bd4b5c008c2e Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 13:20:28 +0100
Subject: [PATCH 18/35] First (incomplete) working proof management endpoint

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 41 +++++++++++++++----
 .../keyproject/key/api/data/ProofStatus.java  | 12 ++++++
 .../key/api/data/TaskFinishedInfo.java        | 10 +++++
 .../key/api/data/TaskStartedInfo.java         | 10 +++++
 .../key/api/remoteapi/ProofApi.java           |  3 +-
 .../key/api/remoteclient/ClientApi.java       | 10 ++---
 6 files changed, 72 insertions(+), 14 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 26835775b86..9ecb9e42ba4 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
@@ -61,7 +61,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
@@ -71,7 +71,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();
@@ -162,14 +162,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);
             }
@@ -177,6 +178,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(() -> {
@@ -499,7 +524,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
@@ -509,17 +534,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..b18fee870d2
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/ProofStatus.java
@@ -0,0 +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.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..9ecacd52b0a
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskFinishedInfo.java
@@ -0,0 +1,10 @@
+/* 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() {
+    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..31a230c41c8
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
@@ -0,0 +1,10 @@
+/* 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() {
+    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 607d17eafac..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
@@ -11,6 +11,7 @@
 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;
 
 /**
@@ -28,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 4f739284e6d703b4c6fd9050d74e18ca3e52a5cd Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 13:21:12 +0100
Subject: [PATCH 19/35] 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 48212f42025effe721efd5822abb8057d2d1997c Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Thu, 20 Feb 2025 14:15:46 +0100
Subject: [PATCH 20/35] Improved interface, environment disposal

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 15 ++++----
 .../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, 73 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 9ecb9e42ba4..cea83a9c595 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
@@ -204,12 +204,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
@@ -354,6 +350,13 @@ 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 b681a01dac0..16f9f6a2fb6 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 98807104b7aab8ffd53493fe4fca3411eb0a7015 Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 16:28:18 +0100
Subject: [PATCH 21/35] Fixed JSON type annotation&retrieval

---
 .../RuntimeClassNameTypeAdapterFactory.java   | 158 ++++++++++++++++++
 .../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   |   7 +
 .../key/api/data/KeyIdentifications.java      |  16 +-
 .../keyproject/key/api/data/LoadParams.java   |   2 +-
 .../key/api/data/MacroDescription.java        |   3 +-
 .../key/api/data/MacroStatistic.java          |   2 +-
 .../org/keyproject/key/api/data/NodeDesc.java |   2 +-
 .../keyproject/key/api/data/NodeTextDesc.java |   3 +-
 .../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  |   3 +-
 .../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 |   3 +-
 24 files changed, 200 insertions(+), 28 deletions(-)
 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/RuntimeClassNameTypeAdapterFactory.java b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
new file mode 100644
index 00000000000..855e1e3ca84
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/RuntimeClassNameTypeAdapterFactory.java
@@ -0,0 +1,158 @@
+/* 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;
+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 8b902318287..e7d6c761e62 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
@@ -200,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.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 b1eb59132f1..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
@@ -12,7 +12,7 @@
  */
 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()),
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 c693a179524..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
@@ -14,7 +14,7 @@
  */
 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..522a1c7a0e9
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/KeYDataTransferObject.java
@@ -0,0 +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.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 16f9f6a2fb6..b918173aa27 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,32 @@ 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 +135,15 @@ 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 fae51686bd0..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
@@ -15,5 +15,5 @@
  * @param includes
  */
 public record LoadParams(File problemFile, List<File> classPath, File bootClassPath,
-        List<File> includes) {
+        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..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) {
+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 06aa618634d..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,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(),
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 5c72cfec2c9..662eea0ab6a 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,7 +14,7 @@
 public record NodeDesc(KeyIdentifications.NodeId nodeid,
         String branchLabel,
         boolean scriptRuleApplication,
-        @Nullable List<NodeDesc> children) {
+        @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,
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 4bd7d186a58..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) {
+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 0eafbefcf89..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,5 +17,5 @@ public record ProblemDefinition(
         @Nullable List<FunctionDesc> functions,
         @Nullable List<PredicateDesc> predicates,
         @Nullable List<String> antecTerms,
-        @Nullable List<String> succTerms) {
+        @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 56fba7086c6..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
@@ -10,7 +10,7 @@
  * @version 1 (29.10.23)
  */
 public record ProofMacroDesc(String name, String category, String description,
-        String scriptCommandName) {
+        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 b18fee870d2..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) {
+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 a13e03025da..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
@@ -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 9ecacd52b0a..bc9707ed7bc 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,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 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 31a230c41c8..5b373d6b6e2 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,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-only */
 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 11b9bb75f6d..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,7 +10,8 @@
  * @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 661cf5fc1237c05bdf80a0308c99d804243877dd Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 16:28:55 +0100
Subject: [PATCH 22/35] Updated json type annotation on codegen/python side

---
 .../key/api/doc/ExtractMetaData.java          |  5 +-
 .../key_project/key/api/doc/Metamodel.java    | 50 +++++++++++++------
 .../key/api/doc/PythonGenerator.java          |  8 ++-
 keyext.client.python/keyapi/keydata.py        | 18 ++++---
 keyext.client.python/keyapi/rpc.py            |  5 +-
 5 files changed, 58 insertions(+), 28 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 8c8c3e55fbe..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
@@ -230,12 +230,13 @@ 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 9762ee1f107..02d64427425 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
@@ -66,27 +66,33 @@ record Field(String name, /* Type */ String type, String documentation) {
     public sealed
 
 
-    interface Type {
-        default String kind() {
-            return getClass().getSimpleName();
+interface Type {
+    default String kind() {
+            return getClass().getName();
         }
 
         String documentation();
 
-        String name();
-    }
+    String name();
+
+    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();
     }
 
+}
+
     record ListType(Type type, String documentation) implements Type {
 
         @Override
@@ -94,15 +100,22 @@ public String name() {
             return type().name() + "[]";
         }
 
+    public String identifier() {
+        return type().identifier()+"[]";
+    }
+
     }
 
-    record ObjectType(String typeName, List<Field> fields, String documentation) implements Type {
+    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 {
@@ -112,14 +125,21 @@ 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 3b7c6447377..f3320656f14 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,15 @@ 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 7fb5af486fd48e927d5dc0ce698abe9bf7fc40ef Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 17:01:20 +0100
Subject: [PATCH 23/35] Merge branch 'steuber/jsonrpc' into weigl/jsonrpc

---
 .../org/keyproject/key/api/KeyApiImpl.java    | 19 +++++----
 .../keyproject/key/api/TermActionUtil.java    |  6 ++-
 .../key/api/data/ProofScriptCommandDesc.java  |  4 +-
 .../key/api/remoteapi/ProofApi.java           |  2 +-
 keyext.client.python/keyapi/keydata.py        | 42 +++++++++++--------
 .../keyapi/server_internal.py                 |  4 +-
 6 files changed, 44 insertions(+), 33 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 cea83a9c595..7522f6d89ca 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
@@ -13,14 +13,15 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 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.ExampleChooser;
-import de.uka.ilkd.key.macros.ProofMacroFacade;
+import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.macros.ProofMacroFinishedInfo;
-import de.uka.ilkd.key.macros.scripts.ProofScriptCommandFacade;
+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;
@@ -44,6 +45,7 @@
 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;
@@ -114,14 +116,14 @@ public CompletableFuture<String> getVersion() {
     @Override
     public CompletableFuture<List<ProofMacroDesc>> getAvailableMacros() {
         return CompletableFuture.completedFuture(
-            ProofMacroFacade.instance().getMacros().stream()
+                StreamSupport.stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(),false)
                     .map(ProofMacroDesc::from).toList());
     }
 
     @Override
     public CompletableFuture<List<ProofScriptCommandDesc>> getAvailableScriptCommands() {
         return CompletableFuture.completedFuture(
-            ProofScriptCommandFacade.instance().getScriptCommands().stream()
+                StreamSupport.stream(ClassLoaderUtil.loadServices(ProofScriptCommand.class).spliterator(),false)
                     .map(ProofScriptCommandDesc::from).toList());
     }
 
@@ -143,12 +145,13 @@ public CompletableFuture<MacroStatistic> script(ProofId proofId, String scriptLi
     }
 
     @Override
-    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroId,
+    public CompletableFuture<MacroStatistic> macro(ProofId proofId, String macroName,
             StreategyOptions options) {
         return CompletableFuture.supplyAsync(() -> {
             var proof = data.find(proofId);
             var env = data.find(proofId.env());
-            var macro = Objects.requireNonNull(ProofMacroFacade.instance().getMacro(macroId));
+            var macro = StreamSupport.stream(ClassLoaderUtil.loadServices(ProofMacro.class).spliterator(),false)
+                    .filter(it -> it.getName().equals(macroName)).findFirst().orElseThrow();
 
             try {
                 var info =
@@ -322,7 +325,7 @@ public CompletableFuture<List<FunctionDesc>> functions(EnvironmentId envId) {
     public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(envId);
-            var contracts = env.getAvailableContracts();
+            var contracts = env.getProofContracts();
             return contracts.stream().map(it -> ContractDesc.from(envId, env.getServices(), it))
                     .toList();
         });
@@ -332,7 +335,7 @@ public CompletableFuture<List<ContractDesc>> contracts(EnvironmentId envId) {
     public CompletableFuture<ProofId> openContract(ContractId contractId) {
         return CompletableFuture.supplyAsync(() -> {
             var env = data.find(contractId.envId());
-            var contracts = env.getAvailableContracts();
+            var contracts = env.getProofContracts();
             var contract =
                 contracts.stream()
                         .filter(it -> Objects.equals(it.getName(), contractId.contractId()))
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 4e121061d84..854dfb98b1c 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,12 +6,12 @@
 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;
 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.*;
@@ -21,6 +21,7 @@
 import org.key_project.util.collection.ImmutableSLList;
 
 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;
@@ -79,7 +80,8 @@ public TermActionUtil(@NonNull NodeTextId nodeTextId, @NonNull KeYEnvironment<?>
         occ = pos.getPosInOccurrence();
         ProofControl c = env.getUi().getProofControl();
         final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
-        for (ProofMacro macro : ProofMacroFacade.instance().getMacros()) {
+        var macros = ClassLoaderUtil.loadServices(ProofMacro.class);
+        for (ProofMacro macro : macros) {
             var id = new KeyIdentifications.TermActionId(nodeTextId.nodeId(), pos.toString(),
                 "macro:" + macro.getScriptCommandName());
             TermActionDesc ta = new TermActionDesc(id, macro.getName(), macro.getDescription(),
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 0ba1f9ac2d1..38da636bb44 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,8 @@
  * @author Alexander Weigl
  * @version 1 (29.10.23)
  */
-public record ProofScriptCommandDesc() implements KeYDataTransferObject {
+public record ProofScriptCommandDesc(String macroId, String documentation) implements KeYDataTransferObject {
     public static ProofScriptCommandDesc from(ProofScriptCommand<?> proofScriptCommand) {
-        return null;
+        return new ProofScriptCommandDesc(proofScriptCommand.getName(), proofScriptCommand.getDocumentation());
     }
 }
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 a7c6a4dbacb..c5079efb1bc 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
@@ -25,7 +25,7 @@ CompletableFuture<MacroStatistic> script(ProofId proof, String scriptLine,
             StreategyOptions options);
 
     @JsonRequest
-    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroId,
+    CompletableFuture<MacroStatistic> macro(ProofId proof, String macroName,
             StreategyOptions options);
 
     @JsonRequest
diff --git a/keyext.client.python/keyapi/keydata.py b/keyext.client.python/keyapi/keydata.py
index 35e2e3a46a1..2bce00393eb 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,19 @@ 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):
     """"""
 
@@ -169,6 +175,15 @@ 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:
     """"""
 
@@ -182,15 +197,6 @@ def __init__(self, id, name):
         self.id = id
         self.name = name
 
-class TreeNodeId:
-    """"""
-
-    id : str
-    """"""
-
-    def __init__(self, id):
-        self.id = id
-
 class PrintOptions:
     """"""
 
@@ -557,7 +563,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.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 = { "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_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" }
+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" }
 
diff --git a/keyext.client.python/keyapi/server_internal.py b/keyext.client.python/keyapi/server_internal.py
index 30c38f61875..87285a33273 100644
--- a/keyext.client.python/keyapi/server_internal.py
+++ b/keyext.client.python/keyapi/server_internal.py
@@ -121,10 +121,10 @@ 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, macroId : str, options : StreategyOptions) -> MacroStatistic:
+    def proof_macro(self, proof : ProofId, macroName : str, options : StreategyOptions) -> MacroStatistic:
        """"""
 
-       return self._call_sync("proof/macro", [proof , macroId , options])
+       return self._call_sync("proof/macro", [proof , macroName , options])
 
     def proof_pruneTo(self, nodeId : NodeId) -> typing.List[NodeDesc]:
        """"""

From 8a92b1d0477b31d07f0f3851f19a06ad4e6a7f5e Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 17:47:55 +0100
Subject: [PATCH 24/35] 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 7522f6d89ca..774f85ee1c5 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
@@ -129,7 +129,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());
@@ -146,7 +146,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());
@@ -165,12 +165,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);
@@ -181,30 +182,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 3eff422c99838e96b153245aded40be0f61dc8cf Mon Sep 17 00:00:00 2001
From: Samuel Teuber <teuber@kit.edu>
Date: Mon, 24 Mar 2025 18:55:27 +0100
Subject: [PATCH 25/35] Extracted node description function

---
 .../ilkd/key/proof/ProofNodeDescription.java  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 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

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

---
 .../org/keyproject/key/api/KeyApiImpl.java    |  6 ++--
 .../org/keyproject/key/api/StartServer.java   |  4 +--
 .../org/keyproject/key/api/data/NodeDesc.java | 14 +++++-----
 keyext.client.python/keyapi/keydata.py        | 28 +++++++++++--------
 keyext.client.python/keyapi/server.py         |  3 ++
 5 files changed, 32 insertions(+), 23 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 774f85ee1c5..a3b3a83e1e5 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
@@ -54,6 +54,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();
 
@@ -213,7 +215,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
@@ -230,7 +232,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 e7d6c761e62..a65779f71ce 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
@@ -200,8 +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();
     }
 
     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 662eea0ab6a..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
@@ -12,12 +12,12 @@
  * @version 1 (13.10.23)
  */
 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);
+                       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.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 18e3985c47e80803a9ce0d32ab28703af2130b5e Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Mon, 7 Apr 2025 00:15:17 +0200
Subject: [PATCH 27/35] reformat / remove weakrefs from the data model

---
 .../ilkd/key/proof/ProofNodeDescription.java  |  5 +-
 .../key_project/key/api/doc/Metamodel.java    | 56 ++++++++++---------
 .../org/keyproject/key/api/KeyApiImpl.java    | 16 ++++--
 .../org/keyproject/key/api/StartServer.java   |  3 +-
 .../keyproject/key/api/TermActionUtil.java    |  3 +-
 .../key/api/data/KeyIdentifications.java      | 26 +++------
 .../org/keyproject/key/api/data/NodeDesc.java | 15 ++---
 .../key/api/data/ProofScriptCommandDesc.java  |  6 +-
 .../key/api/data/StrategyOptions.java         | 36 ++++++------
 9 files changed, 87 insertions(+), 79 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/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 02d64427425..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
@@ -66,32 +66,32 @@ record Field(String name, /* Type */ String type, String documentation) {
     public sealed
 
 
-interface Type {
-    default String kind() {
+    interface Type {
+        default String kind() {
             return getClass().getName();
         }
 
         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 {
 
@@ -100,13 +100,14 @@ 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() {
@@ -125,21 +126,22 @@ 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;
         }
-    }
 
-    public String identifier(){
-        return typeFullName;
+        public String identifier() {
+            return typeFullName;
+        }
     }
-}}
+}
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 a3b3a83e1e5..72bd3db7274 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
@@ -41,11 +41,11 @@
 
 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;
@@ -118,14 +118,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());
     }
 
@@ -152,7 +155,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 {
@@ -173,7 +177,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/StartServer.java b/keyext.api/src/main/java/org/keyproject/key/api/StartServer.java
index a65779f71ce..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
@@ -200,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/KeyIdentifications.java b/keyext.api/src/main/java/org/keyproject/key/api/data/KeyIdentifications.java
index b918173aa27..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);
@@ -151,26 +144,25 @@ public record TreeNodeId(String id) implements KeYDataTransferObject {
      * @author Alexander Weigl
      * @version 1 (28.10.23)
      */
-    public record KeyEnvironmentContainer(WeakReference<KeYEnvironment<?>> env,
+    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,
+    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/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/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/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));

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

---
 .../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 +++------
 8 files changed, 43 insertions(+), 43 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 72bd3db7274..5a5554cd81b 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,24 +21,26 @@
 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.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;
@@ -64,7 +66,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));
         }
 
@@ -138,11 +140,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);
             }
@@ -407,7 +410,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(),
@@ -459,7 +463,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());
@@ -514,7 +518,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));
         }
 
@@ -524,12 +528,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) {
 

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

---
 .../key/api/doc/ExtractMetaData.java          |  6 ++
 .../org/key_project/key/api/doc/Main.java     | 87 +++++++++++++++++++
 .../key/api/doc/PythonGenerator.java          | 15 +++-
 3 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 keyext.api.doc/src/main/java/org/key_project/key/api/doc/Main.java

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..19c13ffcc13 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
@@ -188,6 +188,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!");
         }
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..e601e2882c7
--- /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/PythonGenerator.java b/keyext.api.doc/src/main/java/org/key_project/key/api/doc/PythonGenerator.java
index f3320656f14..0d7f84cb4c6 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
@@ -53,9 +53,18 @@ protected String asPython(String typeName) {
     }
 
     protected String asPython(Metamodel.Type t) {
-        if (t instanceof Metamodel.ListType lt) {
-            return "typing.List[" + asPython(lt.type()) + "]";
-        }
+        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.EitherType lt) {
             return "typing.Union[" + asPython(lt.a()) + ", " + asPython(lt.b()) + "]";

From 751bd54498e76b92aff255b972bfb885235c2bd3 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 28 Nov 2025 03:00:00 +0100
Subject: [PATCH 30/35] 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   |   18 +-
 .../key/api/doc/ExtractMetaData.java          |  253 ++--
 .../org/key_project/key/api/doc/Main.java     |    5 +-
 .../key_project/key/api/doc/Metamodel.java    |   44 +-
 .../key/api/doc/PythonGenerator.java          |   18 +-
 keyext.api/build.gradle                       |    4 +
 .../org/keyproject/key/api/KeyApiImpl.java    |    6 +-
 .../keyproject/key/api/data/ContractDesc.java |   11 +-
 .../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   |    4 +-
 .../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    |   13 +
 .../key/api/remoteapi/ExampleApi.java         |    1 +
 .../api/remoteclient/ShowDocumentParams.java  |   48 +-
 .../formal/keyextclientjava/MyKeyClient.java  |    2 +-
 24 files changed, 299 insertions(+), 1886 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 0c275f1d19e..bcc740e0867 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-symbol-solver-core:3.26.1")
+    //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/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..8e40ca5607f 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
@@ -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);
 
@@ -92,23 +92,33 @@ 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(),
+                    """.formatted(
+                type.documentation(),
+                type.name(),
                 ot.fields().stream().sorted(Comparator.comparing(Metamodel.Field::name))
-                        .map(it -> "\t%s : %s".formatted(it.name(), it.type()))
+                        .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())));
+                    """.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());
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 19c13ffcc13..f3ef0c1b856 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,31 +9,16 @@
                                      */
 
 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;
-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 com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializer;
+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 org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
@@ -43,7 +28,6 @@
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 import picocli.CommandLine;
-import picocli.CommandLine.Option;
 
 /**
  * @author Alexander Weigl
@@ -56,21 +40,10 @@
     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 Map<Class<?>, Metamodel.Type> types = new HashMap<>();
     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);
-    }
+    public ExtractMetaData() {}
 
     @Override
     public Integer call() throws IOException {
@@ -164,13 +137,20 @@ private void addServerEndpoint(Method method) {
     }
 
     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("");
+        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("");
+         */
     }
 
     private List<Metamodel.Argument> translate(Parameter[] parameters) {
@@ -183,21 +163,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)
@@ -224,48 +189,81 @@ 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();
+        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(),
+                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);
         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);
@@ -311,25 +309,106 @@ 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>!!!";
+    }
+
+    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>!!!??!?!?";
+    }
 
-            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 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..4e329ac3598 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;
@@ -33,7 +32,7 @@
 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");
+    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 +44,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 13f0e0573e3..b22cfdb2d60 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
@@ -11,6 +11,7 @@
 import java.util.List;
 
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Alexander Weigl
@@ -18,9 +19,14 @@
  */
 @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) {
+            java.util.Map<Class<?>, Type> types) {
     }
 
     sealed
@@ -40,7 +46,14 @@ default String kind() {
     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 {
     }
 
@@ -48,7 +61,9 @@ 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 {
     }
 
@@ -93,6 +108,10 @@ 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
@@ -106,6 +125,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 {
 
@@ -132,7 +157,13 @@ public String identifier() {
 
     }
 
-    public record EnumType(String typeName, String typeFullName, List<String> values,
+    /// 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<EnumConstant> values,
             String documentation) implements Type {
 
         @Override
@@ -143,5 +174,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 0d7f84cb4c6..c798bfa6118 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
@@ -11,6 +11,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;
@@ -82,8 +83,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));
     }
 
 
@@ -206,15 +214,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 08b6cbda804..e1472cbc606 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 5a5554cd81b..991a8b3b22c 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
@@ -49,11 +49,11 @@
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.*;
+import org.keyproject.key.api.data.ExampleDesc;
 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.PrintOptions;
 import org.keyproject.key.api.remoteapi.KeyApi;
-import org.keyproject.key.api.remoteapi.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..3290012e797 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,17 @@
 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..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
@@ -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..e55c2aa7a0b 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,
+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..4e4ad0aecab
--- /dev/null
+++ b/keyext.api/src/main/java/org/keyproject/key/api/data/TextRange.java
@@ -0,0 +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.
+ */
+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..0c99fbf268f 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,35 +3,27 @@
  * 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;
+
+/**
+ * @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..9eb19d31da6 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
@@ -27,10 +27,10 @@
 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.PrintOptions;
 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.*;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
 import org.kordamp.ikonli.javafx.FontIcon;

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

---
 keyext.api.doc/build.gradle                   |   2 +-
 .../org/key_project/key/api/doc/DocGen.java   | 158 ++++++----------
 .../key/api/doc/ExtractMetaData.java          | 154 ++++++++-------
 .../org/key_project/key/api/doc/Main.java     |   2 +-
 .../key_project/key/api/doc/Metamodel.java    |  97 +++++++---
 .../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 |  12 +-
 .../key/api/data/TaskStartedInfo.java         |   5 +-
 .../keyproject/key/api/data/TraceValue.java   |  28 ++-
 .../key/api/remoteapi/ServerManagement.java   |  30 +--
 .../key/api/remoteclient/ClientApi.java       |  69 +++----
 .../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  |  10 +-
 .../api/remoteclient/ShowMessageParams.java   |  16 +-
 .../ShowMessageRequestParams.java             |  20 +-
 .../org/keyproject/key/api/SimpleClient.java  |  10 +-
 .../formal/keyextclientjava/MyKeyClient.java  |  11 +-
 22 files changed, 524 insertions(+), 326 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 bcc740e0867..2e094d97ddd 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-symbol-solver-core:3.26.1")
+    implementation("org.freemarker:freemarker:2.3.34")
     implementation("info.picocli:picocli:4.7.6")
 }
\ No newline at end of file
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 8e40ca5607f..f5d7e06fc0b 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 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;
+
+import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
+import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.TemplateException;
 
 /**
+ * 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,99 +31,51 @@ 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 f3ef0c1b856..ac05b6f4ffd 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
@@ -12,13 +12,14 @@
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
 
 import de.uka.ilkd.key.proof.Proof;
 
-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 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;
@@ -41,9 +42,12 @@
 public class ExtractMetaData implements Callable<Integer> {
     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 Integer call() throws IOException {
@@ -66,37 +70,16 @@ public Integer call() throws IOException {
             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();
+        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 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) {
         var jsonSegment = method.getDeclaringClass().getAnnotation(JsonSegment.class);
         if (jsonSegment == null)
@@ -136,21 +119,24 @@ 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) {
@@ -197,7 +183,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) {
@@ -214,35 +200,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)))
+                    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);
@@ -251,18 +242,46 @@ 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 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 String findDocumentation(Class<?> type) {
+    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) {
@@ -292,7 +311,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()) {
@@ -396,16 +416,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 4e329ac3598..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
@@ -49,7 +49,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 b22cfdb2d60..6736b8aa36a 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
@@ -9,6 +9,7 @@
                                      */
 
 import java.util.List;
+import java.util.Map;
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -26,21 +27,52 @@ 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) {
     }
 
-    sealed
+    /// Javadoc texts
+    public record HelpText(String text, List<HelpTextEntry> others) {
+    }
+
+    /// Javadoc categories
+    public record HelpTextEntry(String name, String value) {
+    }
 
-    interface Endpoint {
+
+    /// An {@link Endpoint} is a provided service/method.
+    public sealed interface Endpoint {
+        /// complete name of the service
         String name();
 
-        String documentation();
+        /// a markdown documentation
+        @Nullable
+        HelpText documentation();
 
         default String kind() {
             return getClass().getSimpleName();
         }
 
         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");
+        }
     }
 
     public record Argument(String name, String type) {
@@ -52,29 +84,33 @@ 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 {
     }
 
-    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 {
     }
 
-    record ClientNotification(String name, String documentation, List<Argument> args)
+    ///
+    public record ClientNotification(String name, @Nullable HelpText documentation,
+            List<Argument> args)
             implements Endpoint {
     }
 
-    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);
         }
     }
 
@@ -86,20 +122,24 @@ default String kind() {
             return getClass().getName();
         }
 
-        String documentation();
+        /// Documentation of the data type
+        @Nullable
+        HelpText documentation();
 
         String name();
 
         String identifier();
+
     }
 
 
-    enum BuiltinType implements Type {
+    /// Typical built-in data types supported by the API
+    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() {
@@ -111,9 +151,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() + "[]";
@@ -123,6 +161,10 @@ public String identifier() {
             return type().identifier() + "[]";
         }
 
+        @Override
+        public @Nullable HelpText documentation() {
+            return null;
+        }
     }
 
     /// Data type of objects or struct or record.
@@ -131,9 +173,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;
@@ -144,7 +185,11 @@ public String identifier() {
         }
     }
 
-    public record EitherType(Type a, Type b, String documentation) implements Type {
+    /// A data type representing that a method returns or expecting either type `a` or `b`.
+    ///
+    /// @param a
+    /// @param b
+    public record EitherType(Type a, Type b) implements Type {
 
         @Override
         public String name() {
@@ -155,6 +200,10 @@ public String identifier() {
             return name();
         }
 
+        @Override
+        public @Nullable HelpText documentation() {
+            return null;
+        }
     }
 
     /// Enumeration data type
@@ -164,7 +213,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() {
@@ -177,7 +226,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 c798bfa6118..b77c58d2965 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
@@ -90,7 +90,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 3290012e797..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
@@ -7,8 +7,18 @@
 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/TaskStartedInfo.java b/keyext.api/src/main/java/org/keyproject/key/api/data/TaskStartedInfo.java
index 895523c3796..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
@@ -3,8 +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)
+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..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
@@ -9,78 +9,83 @@
 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;
 
+/**
+ * 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..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
@@ -5,16 +5,10 @@
 
 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 0c99fbf268f..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
@@ -7,6 +7,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/`
@@ -20,7 +22,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..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
@@ -3,10 +3,8 @@
  * 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..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
@@ -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..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
@@ -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..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
@@ -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,8 @@ 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 9eb19d31da6..5256453b9c0 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,8 @@ public void showMessage(ShowMessageParams params) {
         }
 
         @Override
-        public CompletableFuture<MessageActionItem> userResponse(ShowMessageRequestParams params) {
+        public CompletableFuture<MessageActionItem> showMessageWithActions(
+                ShowMessageRequestParams params) {
             return null;
         }
 

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

---
 .../java/de/uka/ilkd/key/gui/Example.java     |  58 ++++----
 .../de/uka/ilkd/key/gui/ExampleChooser.java   |  54 ++++---
 .../org/key_project/key/api/doc/DocGen.java   |   6 +-
 .../key/api/doc/ExtractMetaData.java          |   2 -
 .../key_project/key/api/doc/Metamodel.java    |   7 +-
 .../src/main/resources/templates/docs.ftl     |   9 ++
 .../org/keyproject/key/api/KeyApiImpl.java    |  45 +++---
 .../org/keyproject/key/api/NodeTextId.java    |   4 -
 .../keyproject/key/api/data/DataExamples.java | 140 ++++++++++++++++++
 .../keyproject/key/api/data/ExampleDesc.java  |   5 +
 .../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/TermActionDesc.java          |  20 +--
 .../key/api/data/TermActionKind.java          |  19 ++-
 .../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 +++
 .../formal/keyextclientjava/MyKeyClient.java  |   8 +-
 29 files changed, 571 insertions(+), 145 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/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/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 f5d7e06fc0b..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
@@ -10,10 +10,12 @@
 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.
@@ -36,11 +38,11 @@ public String get() {
             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);
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 ac05b6f4ffd..cde283cd04e 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
@@ -24,11 +24,9 @@
 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;
 
 /**
  * @author Alexander Weigl
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 6736b8aa36a..a3d3300d7be 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
@@ -13,6 +13,7 @@
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import org.keyproject.key.api.data.DataExamples;
 
 /**
  * @author Alexander Weigl
@@ -129,7 +130,6 @@ default String kind() {
         String name();
 
         String identifier();
-
     }
 
 
@@ -183,6 +183,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`.
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 991a8b3b22c..e9e0597e41b 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,8 +51,6 @@
 import org.keyproject.key.api.data.*;
 import org.keyproject.key.api.data.ExampleDesc;
 import org.keyproject.key.api.data.KeyIdentifications.*;
-import org.keyproject.key.api.data.NodeText;
-import org.keyproject.key.api.data.PrintOptions;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
 
@@ -238,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) {
@@ -281,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;
@@ -369,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();
@@ -384,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
@@ -400,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();
 
@@ -492,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/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/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 e55c2aa7a0b..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/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/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.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 5256453b9c0..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,11 +26,7 @@
 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.PrintOptions;
-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.remoteclient.*;
 import org.kordamp.ikonli.fontawesome5.FontAwesomeRegular;
@@ -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 =

From a1d86dddacee0ff8db4647f2a17ff808c8a59a53 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 21 Dec 2025 14:53:21 +0100
Subject: [PATCH 33/35] 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       |  5 ++---
 3 files changed, 33 insertions(+), 9 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..a373c6011e2 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..c058dacd708 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,6 +25,7 @@
 public interface ProofLoadApi {
 
     /**
+     * Do not use. Not implemented
      *
      * @param problem
      * @return
@@ -49,10 +50,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 ffa453cbd2c3afb08a2cc747eb5ca6a225ad6493 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sat, 27 Dec 2025 22:27:51 +0100
Subject: [PATCH 34/35] better documentation

---
 .../org/key_project/key/api/doc/DocGen.java   |  20 +-
 .../src/main/resources/templates/docs.ftl     | 345 ++++++++++++------
 2 files changed, 241 insertions(+), 124 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..355394b89f0 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
@@ -5,10 +5,12 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import de.uka.ilkd.key.util.KeYConstants;
+import de.uka.ilkd.key.util.KeYResourceManager;
 
 import freemarker.core.HTMLOutputFormat;
 import freemarker.ext.beans.ZeroArgumentNonVoidMethodPolicy;
@@ -38,6 +40,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);
@@ -64,11 +67,22 @@ public String get() {
                         .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());
 
+            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>

From 7adc9a13e482352f16258cd1e372e615d7bf2231 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Sun, 1 Feb 2026 22:58:00 +0100
Subject: [PATCH 35/35] repair branch after rewriting

---
 .../uka/ilkd/key/control/KeYEnvironment.java  |   1 +
 .../main/java/de/uka/ilkd/key/proof/Goal.java |   5 +-
 .../main/java/de/uka/ilkd/key/core/Main.java  |  22 +--
 .../key/gui/actions/OpenExampleAction.java    |   8 +-
 .../key/gui/actions/RunAllProofsAction.java   |   2 +-
 keyext.api.doc/src/main/java/PyGen.java       | 145 ------------------
 .../key/api/doc/ExtractMetaData.java          |  27 +---
 .../key_project/key/api/doc/Metamodel.java    |  31 ++--
 .../key/api/doc/PythonGenerator.java          |  36 +----
 .../keyproject/key/api/FileTypeAdapter.java   |  23 ---
 .../keyproject/key/api/GenericSerializer.java |  62 --------
 .../org/keyproject/key/api/KeyApiImpl.java    |   2 +-
 .../org/keyproject/key/api/NodeTextDesc.java  |  11 --
 .../org/keyproject/key/api/data/GoalText.java |  13 --
 .../org/keyproject/key/api/data/PrintId.java  |  11 --
 .../keyproject/key/api/data/TermAction.java   |  11 --
 .../keyproject/key/api/data/TermActionId.java |   4 -
 .../keyproject/key/api/data/TreeNodeId.java   |   4 -
 .../keyproject/key/api/remoteapi/EnvId.java   |  11 --
 .../key/api/remoteapi/KeyApiImpl.java         |  60 --------
 .../key/api/remoteapi/LoadParams.java         |  12 --
 .../keyproject/key/api/remoteapi/ProofId.java |   7 -
 .../key/api/remoteapi/ProofLoading.java       |  23 ---
 .../edu/kit/keyext/client/RPCLayerTest.java   |   2 -
 24 files changed, 47 insertions(+), 486 deletions(-)
 delete mode 100644 keyext.api.doc/src/main/java/PyGen.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.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
 delete mode 100644 keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.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
 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

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 e04d06c3a37..2d0f4c1fae2 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
@@ -24,6 +24,7 @@
 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;
 
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 6559425729c..3a6c03356a4 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
@@ -16,10 +16,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/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 d92fbd3aa7d..a0ad91d442d 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());
+        if (examplesDir == null) {
+            setExamplesDir(examplesDir.toAbsolutePath());
+        }
     }
 
-    private static File setupExamples() {
+    private static @Nullable 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 = Files.createTempDirectory("key-examples");
 
             if (tempDir != null) {
-                IOUtil.extractZip(examplesURL.openStream(), tempDir.toPath());
+                IOUtil.extractZip(examplesURL.openStream(), tempDir);
             }
             return tempDir;
         } catch (IOException e) {
@@ -555,9 +557,9 @@ 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;
     }
 
@@ -568,7 +570,7 @@ private void preProcessInput()
      *
      * @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/actions/OpenExampleAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java
index a630237bd5f..2aeefdfb012 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;
@@ -30,10 +30,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/PyGen.java b/keyext.api.doc/src/main/java/PyGen.java
deleted file mode 100644
index 02cec8af7a6..00000000000
--- a/keyext.api.doc/src/main/java/PyGen.java
+++ /dev/null
@@ -1,145 +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;
-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));
-    }
-}
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 cde283cd04e..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
@@ -32,12 +32,8 @@
  * @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 Map<Class<?>, Metamodel.Type> types = new HashMap<>();
     private final Map<String, HelpText> segDocumentation = new TreeMap<>();
@@ -48,18 +44,7 @@ public ExtractMetaData() {
     }
 
     @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);
         }
@@ -284,7 +269,7 @@ private static HelpText printFieldDocumentation(FieldJavadoc javadoc) {
 
     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);
@@ -429,4 +414,8 @@ else if (type == CompletableFuture.class) {
 
         return null;
     }
+
+    public Metamodel.KeyApi getApi() {
+        return keyApi;
+    }
 }
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 a3d3300d7be..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
@@ -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.util.List;
 import java.util.Map;
@@ -15,10 +10,11 @@
 import org.jspecify.annotations.Nullable;
 import org.keyproject.key.api.data.DataExamples;
 
-/**
- * @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 {
 
@@ -51,9 +47,10 @@ public sealed interface Endpoint {
         HelpText documentation();
 
         default String kind() {
-            return getClass().getSimpleName();
+            return getClass().getName();
         }
 
+        /// a list of its arguments
         List<Argument> args();
 
         ///
@@ -76,6 +73,10 @@ default boolean isAsync() {
         }
     }
 
+    /// A [Argument] of an endpoint
+    ///
+    /// @param name the argument name
+    /// @param type the argument type
     public record Argument(String name, String type) {
     }
 
@@ -115,10 +116,8 @@ public record Field(String name, /* Type */ String type, @Nullable HelpText docu
         }
     }
 
-    public sealed
-
-
-    interface Type {
+    /// A data type
+    public sealed interface Type {
         default String kind() {
             return getClass().getName();
         }
@@ -127,8 +126,10 @@ default String kind() {
         @Nullable
         HelpText documentation();
 
+        /// name of the data type
         String name();
 
+        ///
         String identifier();
     }
 
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 b77c58d2965..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
@@ -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;
@@ -22,8 +17,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;
@@ -31,10 +26,7 @@ public PythonGenerator(Metamodel.KeyApi metamodel) {
 
     @Override
     public String get() {
-        try (var out = new PrintWriter(target)) {
-            this.out = out;
-            run();
-        }
+        run();
         return target.toString();
     }
 
@@ -67,19 +59,6 @@ protected String asPython(Metamodel.Type t) {
             default -> t.name();
         };
 
-        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, LONG -> "int";
-                case STRING -> "str";
-                case BOOL -> "bool";
-                case DOUBLE -> "float";
-            };
-        }
-        return t.name();
     }
 
     protected Metamodel.Type findType(String typeName) {
@@ -196,15 +175,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/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 11ec95d1430..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/FileTypeAdapter.java
+++ /dev/null
@@ -1,23 +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.io.File;
-import java.io.IOException;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-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/GenericSerializer.java b/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
deleted file mode 100644
index c835293099a..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/GenericSerializer.java
+++ /dev/null
@@ -1,62 +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/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/KeyApiImpl.java
index e9e0597e41b..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
@@ -37,6 +37,7 @@
 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;
@@ -49,7 +50,6 @@
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.keyproject.key.api.data.*;
-import org.keyproject.key.api.data.ExampleDesc;
 import org.keyproject.key.api.data.KeyIdentifications.*;
 import org.keyproject.key.api.remoteapi.KeyApi;
 import org.keyproject.key.api.remoteclient.ClientApi;
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 a7d9585c719..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/NodeTextDesc.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;
-
-/**
- * @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/data/GoalText.java b/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
deleted file mode 100644
index b4269ac1505..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/GoalText.java
+++ /dev/null
@@ -1,13 +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;
-
-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/PrintId.java b/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.java
deleted file mode 100644
index 895ca1b0979..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/PrintId.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 PrintId(String id) {
-}
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 3b5149d275f..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermAction.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 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
deleted file mode 100644
index 4b61cb5bcee..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TermActionId.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.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 4b61cb5bcee..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/data/TreeNodeId.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.data;
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 52d4569aa3f..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/EnvId.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.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/KeyApiImpl.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
deleted file mode 100644
index d95e856b4b0..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/KeyApiImpl.java
+++ /dev/null
@@ -1,60 +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.remoteapi;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-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;
-
-@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 c22064a856a..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/LoadParams.java
+++ /dev/null
@@ -1,12 +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.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/ProofId.java b/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
deleted file mode 100644
index 8081219c642..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofId.java
+++ /dev/null
@@ -1,7 +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.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 745a93bc969..00000000000
--- a/keyext.api/src/main/java/org/keyproject/key/api/remoteapi/ProofLoading.java
+++ /dev/null
@@ -1,23 +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.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;
-}
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 bc5a309a8c6..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
@@ -8,8 +8,6 @@
 import java.io.StringWriter;
 import java.util.concurrent.ArrayBlockingQueue;
 
-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;