1 files changed, 40 insertions, 10 deletions

diff --git a/data/vyconf.proto b/data/vyconf.proto
index 56875a3..30f95aa 100644
--- a/data/vyconf.proto
+++ b/data/vyconf.proto
@@ -9,12 +9,25 @@ message Request {
     OutJSON = 1;
   }
 
-  message Status {
+  message Prompt {
   }
 
   message SetupSession {
-    optional string ClientApplication = 1;
-    optional int32 OnBehalfOf = 2;
+    required int32 ClientPid = 1;
+    optional string ClientApplication = 2;
+    optional int32 OnBehalfOf = 3;
+  }
+
+  message SessionOfPid {
+    required int32 ClientPid = 1;
+  }
+
+  message SessionUpdatePid {
+    required int32 ClientPid = 1;
+  }
+
+  message GetConfig {
+    optional int32 dummy = 1;
   }
 
   message Teardown {
@@ -34,6 +47,14 @@ message Request {
     repeated string Path = 1;
   }
 
+  message Discard {
+    optional int32 dummy = 1;
+  }
+
+  message SessionChanged {
+    optional int32 dummy = 1;
+  }
+
   message Rename {
     repeated string EditLevel = 1;
     required string From = 2;
@@ -64,12 +85,14 @@ message Request {
 
   message Load {
     required string Location = 1;
-    optional ConfigFormat format = 2;
+    required bool cached = 2;
+    optional ConfigFormat format = 3;
   }
 
   message Merge {
     required string Location = 1;
-    optional ConfigFormat format = 2;
+    required bool destructive = 2;
+    optional ConfigFormat format = 3;
   }
 
   message Save {
@@ -125,7 +148,7 @@ message Request {
 
 
   oneof msg {
-    Status status = 1;
+    Prompt prompt = 1;
     SetupSession setup_session = 2;
     Set set = 3;
     Delete delete = 4;
@@ -143,11 +166,17 @@ message Request {
     ListChildren list_children = 16;
     RunOpMode run_op_mode = 17;
     Confirm confirm = 18;
-    EnterConfigurationMode configure = 19;
-    ExitConfigurationMode exit_configure = 20;
+    EnterConfigurationMode enter_configuration_mode = 19;
+    ExitConfigurationMode exit_configuration_mode = 20;
     Validate validate = 21;
     Teardown teardown = 22;
     ReloadReftree reload_reftree = 23;
+    Load load = 24;
+    Discard discard = 25;
+    SessionChanged session_changed = 26;
+    SessionOfPid session_of_pid = 27;
+    SessionUpdatePid session_update_pid = 28;
+    GetConfig get_config = 29;
   }
 }
 
@@ -156,7 +185,7 @@ message RequestEnvelope {
     required Request request = 2;
 }
 
-enum Status {
+enum Errnum {
   SUCCESS = 0;
   FAIL = 1;
   INVALID_PATH = 2;
@@ -166,10 +195,11 @@ enum Status {
   INTERNAL_ERROR = 6;
   PERMISSION_DENIED = 7;
   PATH_ALREADY_EXISTS = 8;
+  UNCOMMITED_CHANGES = 9;
 }
 
 message Response {
-  required Status status = 1;
+  required Errnum status = 1;
   optional string output = 2;
   optional string error = 3;
   optional string warning = 4;