5 files changed, 23 insertions, 0 deletions
diff --git a/src/api/schema.d.ts b/src/api/schema.d.ts
index 224b2be8f..3fd082f51 100644
--- a/src/api/schema.d.ts
+++ b/src/api/schema.d.ts
@@ -310,6 +310,7 @@ type uint32 = number;
     router?: Router;
     reason?: FallbackStep;
     problems?: Problems;
+    cwd?: string;
   }
 
   export interface JSX {
diff --git a/src/api/schema.js b/src/api/schema.js
index 2600ee1d4..b4e98f44f 100644
--- a/src/api/schema.js
+++ b/src/api/schema.js
@@ -478,6 +478,10 @@ function decodeFallbackMessageContainer(bb) {
       result["problems"] = decodeProblems(bb);
       break;
 
+    case 5:
+      result["cwd"] = bb.readString();
+      break;
+
     default:
       throw new Error("Attempted to parse invalid message");
     }
@@ -511,6 +515,12 @@ bb.writeByte(encoded);
     bb.writeByte(4);
     encodeProblems(value, bb);
   }
+
+  var value = message["cwd"];
+  if (value != null) {
+    bb.writeByte(5);
+    bb.writeString(value);
+  }
   bb.writeByte(0);
 
 }
diff --git a/src/api/schema.peechy b/src/api/schema.peechy
index 7aa7ba6c4..17bda9654 100644
--- a/src/api/schema.peechy
+++ b/src/api/schema.peechy
@@ -94,6 +94,7 @@ message FallbackMessageContainer {
   Router router = 2;
   FallbackStep reason = 3;
   Problems problems = 4;
+  string cwd = 5;
 }
  
 
diff --git a/src/api/schema.zig b/src/api/schema.zig
index 56b779727..593b02bdd 100644
--- a/src/api/schema.zig
+++ b/src/api/schema.zig
@@ -686,6 +686,9 @@ reason: ?FallbackStep = null,
 /// problems
 problems: ?Problems = null,
 
+/// cwd
+cwd: ?[]const u8 = null,
+
 
 pub fn decode(reader: anytype) anyerror!FallbackMessageContainer {
   var this = std.mem.zeroes(FallbackMessageContainer);
@@ -706,6 +709,9 @@ pub fn decode(reader: anytype) anyerror!FallbackMessageContainer {
       4 => {
         this.problems = try reader.readValue(Problems); 
 },
+      5 => {
+        this.cwd = try reader.readValue([]const u8); 
+},
       else => {
       return error.InvalidMessage;
       },
@@ -731,6 +737,10 @@ if (this.problems) |problems| {
   try writer.writeFieldID(4);
    try writer.writeValue(problems);
 }
+if (this.cwd) |cwd| {
+  try writer.writeFieldID(5);
+   try writer.writeValue(cwd);
+}
 try writer.endMessage();
 }
 
diff --git a/src/http.zig b/src/http.zig
index 7270ca09f..856502294 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -259,6 +259,7 @@ pub const RequestContext = struct {
             .message = try std.fmt.allocPrint(allocator, fmt, args),
             .router = if (routes.len > 0) Api.Router{ .route = route_index, .params = params, .routes = routes } else null,
             .reason = step,
+            .cwd = this.bundler.fs.top_level_dir,
             .problems = Api.Problems{
                 .code = @truncate(u16, @errorToInt(err)),
                 .name = @errorName(err),