Fix loading within the CLI (#27)

* Fix loading within the CLI

* Remove app

* Remove promise handle

* Fix requested changes

packages/protocol/src/proto/client.proto

@@ -63,4 +63,5 @@ message WorkingInitMessage {
 	}
 	OperatingSystem operating_system = 5;
 	string shell = 6;
+	string builtin_extensions_dir = 7;
 }

packages/protocol/src/proto/client_pb.d.ts

@@ -270,6 +270,9 @@ export class WorkingInitMessage extends jspb.Message {
   getShell(): string;
   setShell(value: string): void;
 
+  getBuiltinExtensionsDir(): string;
+  setBuiltinExtensionsDir(value: string): void;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): WorkingInitMessage.AsObject;
   static toObject(includeInstance: boolean, msg: WorkingInitMessage): WorkingInitMessage.AsObject;
@@ -288,6 +291,7 @@ export namespace WorkingInitMessage {
     workingDirectory: string,
     operatingSystem: WorkingInitMessage.OperatingSystem,
     shell: string,
+    builtinExtensionsDir: string,
   }
 
   export enum OperatingSystem {

packages/protocol/src/proto/client_pb.js

@@ -1684,7 +1684,8 @@ proto.WorkingInitMessage.toObject = function(includeInstance, msg) {
     dataDirectory: msg.getDataDirectory(),
     workingDirectory: msg.getWorkingDirectory(),
     operatingSystem: msg.getOperatingSystem(),
-    shell: msg.getShell()
+    shell: msg.getShell(),
+    builtinExtensionsDir: msg.getBuiltinExtensionsDir()
   };
 
   if (includeInstance) {
@@ -1745,6 +1746,10 @@ proto.WorkingInitMessage.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.setShell(value);
       break;
+    case 7:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setBuiltinExtensionsDir(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1825,6 +1830,13 @@ proto.WorkingInitMessage.prototype.serializeBinaryToWriter = function (writer) {
       f
     );
   }
+  f = this.getBuiltinExtensionsDir();
+  if (f.length > 0) {
+    writer.writeString(
+      7,
+      f
+    );
+  }
 };
 
 
@@ -1927,6 +1939,21 @@ proto.WorkingInitMessage.prototype.setShell = function(value) {
 };
 
 
+/**
+ * optional string builtin_extensions_dir = 7;
+ * @return {string}
+ */
+proto.WorkingInitMessage.prototype.getBuiltinExtensionsDir = function() {
+  return /** @type {string} */ (jspb.Message.getFieldProto3(this, 7, ""));
+};
+
+
+/** @param {string} value  */
+proto.WorkingInitMessage.prototype.setBuiltinExtensionsDir = function(value) {
+  jspb.Message.setField(this, 7, value);
+};
+
+
 /**
  * @enum {number}
  */