@valbuild/server 0.94.0 → 0.95.0

package/dist/declarations/src/ValServer.d.ts

@@ -48,7 +48,7 @@ export declare const ENABLE_COOKIE_VALUE: {
         readonly sameSite: "lax";
     };
 };
-export declare function bufferToReadableStream(buffer: Buffer): import("node:stream/web").ReadableStream<any>;
+export declare function bufferToReadableStream(buffer: Buffer): ReadableStream<any>;
 export declare function getRedirectUrl(query: {
     redirect_to?: string | undefined;
 }, overrideHost: string | undefined): string | {

package/dist/valbuild-server.cjs.dev.js

@@ -2405,8 +2405,8 @@ class ValOps {
   }
 
   // #region createPatch
-  async createPatch(path, patch, patchId, parentRef, authorId) {
-    const saveRes = await this.saveSourceFilePatch(path, patch, patchId, parentRef, authorId);
+  async createPatch(path, patch, patchId, parentRef, sessionId, authorId) {
+    const saveRes = await this.saveSourceFilePatch(path, patch, patchId, parentRef, authorId, sessionId);
     if (fp.result.isErr(saveRes)) {
       console.error(`Could not save source patch at path: '${path}'. Error: ${saveRes.error.errorType === "other" ? saveRes.error.message : saveRes.error.errorType}`);
       if (saveRes.error.errorType === "patch-head-conflict") {
@@ -2798,11 +2798,17 @@ class ValOpsFS extends ValOps {
           parentPatchId: dir
         });
       } else {
-        if (includes && includes.length > 0 && !includes.includes(parsedPatch.data.patchId)) {
+        const patchId = parsedPatch.data.patchId;
+        if (includes && includes.length > 0 && !includes.includes(patchId)) {
           return;
         }
-        patches[parsedPatch.data.patchId] = {
-          ...parsedPatch.data,
+        patches[patchId] = {
+          path: parsedPatch.data.path,
+          patch: parsedPatch.data.patch,
+          parentRef: parsedPatch.data.parentRef,
+          baseSha: parsedPatch.data.baseSha,
+          createdAt: parsedPatch.data.createdAt,
+          authorId: parsedPatch.data.authorId,
           appliedAt: null
         };
       }
@@ -2973,7 +2979,7 @@ class ValOpsFS extends ValOps {
       };
     }
   }
-  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId) {
+  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId, sessionId) {
     const patchDir = this.getParentPatchIdFromParentRef(parentRef);
     try {
       const baseSha = await this.getBaseSha();
@@ -2983,6 +2989,7 @@ class ValOpsFS extends ValOps {
         parentRef,
         path,
         authorId,
+        sessionId,
         baseSha,
         coreVersion: core.Internal.VERSION.core,
         createdAt: new Date().toISOString()
@@ -3421,12 +3428,6 @@ class ValOpsFS extends ValOps {
     return fp.result.ok(Object.fromEntries(Object.entries(patches.patches).map(([patchId, value]) => [patchId, this.getParentPatchIdFromParentRef(value.parentRef)])));
   }
 
-  // #region profiles
-  async getProfiles() {
-    // We do not have profiles in FS mode
-    return [];
-  }
-
   // #region fs file path helpers
   getPatchesDir() {
     return path__namespace["default"].join(this.rootDir, ValOpsFS.VAL_DIR, "patches");
@@ -3535,7 +3536,9 @@ const FSPatch = zod.z.object({
   parentRef: internal.ParentRef,
   authorId: zod.z.string().refine(p => true).nullable(),
   createdAt: zod.z.string().datetime(),
-  coreVersion: zod.z.string().nullable() // TODO: use this to check if patch is compatible with current core version?
+  coreVersion: zod.z.string().nullable(),
+  // TODO: use this to check if patch is compatible with current core version?
+  sessionId: zod.z.string().nullable()
 });
 const FSPatchBase = zod.z.object({
   baseSha: zod.z.string().refine(p => true),
@@ -3637,17 +3640,6 @@ const CommitResponse = zod.z.object({
   commit: CommitSha,
   branch: zod.z.string()
 });
-const ProfilesResponse = zod.z.object({
-  profiles: zod.z.array(zod.z.object({
-    profileId: zod.z.string(),
-    fullName: zod.z.string(),
-    email: zod.z.string().optional(),
-    // TODO: make this required once this can be guaranteed
-    avatar: zod.z.object({
-      url: zod.z.string()
-    }).nullable()
-  }))
-});
 const NonceResponse = zod.z.object({
   nonce: zod.z.string(),
   url: zod.z.string()
@@ -4098,7 +4090,7 @@ class ValOpsHttp extends ValOps {
       };
     }
   }
-  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId) {
+  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId, sessionId) {
     const baseSha = await this.getBaseSha();
     return fetch(`${this.contentUrl}/v1/${this.project}/patches`, {
       method: "POST",
@@ -4110,6 +4102,7 @@ class ValOpsHttp extends ValOps {
         path,
         patch,
         authorId,
+        sessionId,
         patchId,
         parentPatchId: parentRef.type === "patch" ? parentRef.patchId : null,
         baseSha,
@@ -4533,31 +4526,6 @@ class ValOpsHttp extends ValOps {
       };
     }
   }
-
-  // #region profiles
-  async getProfiles() {
-    var _res$headers$get6;
-    const res = await fetch(`${this.contentUrl}/v1/${this.project}/profiles`, {
-      headers: {
-        ...this.authHeaders,
-        "Content-Type": "application/json"
-      }
-    });
-    if (res.ok) {
-      const parsed = ProfilesResponse.safeParse(await res.json());
-      if (parsed.error) {
-        console.error("Could not parse profiles response", parsed.error);
-        throw Error(`Could not get profiles from remote server: wrong format. You might need to upgrade Val.`);
-      }
-      return parsed.data.profiles;
-    }
-    if ((_res$headers$get6 = res.headers.get("Content-Type")) !== null && _res$headers$get6 !== void 0 && _res$headers$get6.includes("application/json")) {
-      const json = await res.json();
-      const message = internal.getErrorMessageFromUnknownJson(json, "Unknown error");
-      throw Error(`Could not get profiles (status: ${res.status}): ${message}`);
-    }
-    throw Error(`Could not get profiles. Got status: ${res.status}`);
-  }
 }
 
 const host = process.env.VAL_CONTENT_URL || core.DEFAULT_CONTENT_HOST;
@@ -4710,6 +4678,16 @@ function hasRemoteFileSchema(schema) {
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
+  const ProfilesResponse = zod.z.object({
+    profiles: zod.z.array(zod.z.object({
+      profileId: zod.z.string(),
+      fullName: zod.z.string(),
+      email: zod.z.string().optional(),
+      avatar: zod.z.object({
+        url: zod.z.string()
+      }).nullable()
+    }))
+  });
   let serverOps;
   if (options.mode === "fs") {
     serverOps = new ValOpsFS(options.valContentUrl, options.cwd, valModules, {
@@ -5559,10 +5537,11 @@ const ValServer = (valModules, options, callbacks) => {
         }
         const patches = req.body.patches;
         let parentRef = req.body.parentRef;
+        const sessionId = req.body.sessionId ?? null;
         const authorId = "id" in auth ? auth.id : null;
         const newPatchIds = [];
         for (const patch of patches) {
-          const createPatchRes = await serverOps.createPatch(patch.path, patch.patch, patch.patchId, parentRef, authorId);
+          const createPatchRes = await serverOps.createPatch(patch.path, patch.patch, patch.patchId, parentRef, sessionId, authorId);
           if (fp.result.isErr(createPatchRes)) {
             if (createPatchRes.error.errorType === "patch-head-conflict") {
               return {
@@ -5923,13 +5902,87 @@ const ValServer = (valModules, options, callbacks) => {
             }
           };
         }
-        const profiles = await serverOps.getProfiles();
-        return {
-          status: 200,
-          json: {
-            profiles
+        if (!options.project) {
+          return {
+            status: 500,
+            json: {
+              message: "Project is not configured"
+            }
+          };
+        }
+        const authDataRes = await getRemoteFileAuth();
+        if (authDataRes.status !== 200) {
+          if (serverOps instanceof ValOpsFS && authDataRes.json.errorCode === "pat-error") {
+            return {
+              status: 200,
+              json: {
+                profiles: []
+              }
+            };
+          }
+          return {
+            status: 500,
+            json: {
+              message: authDataRes.json.message
+            }
+          };
+        }
+        const authData = authDataRes.json.remoteFileAuth;
+        const execFetch = async headers => {
+          try {
+            const upstreamUrl = `${options.valContentUrl}/v1/${options.project}/profiles`;
+            const upstreamRes = await fetch(upstreamUrl, {
+              method: "GET",
+              headers
+            });
+            if (!upstreamRes.ok) {
+              const text = await upstreamRes.text();
+              const isAuthError = upstreamRes.status === 401 || upstreamRes.status === 403;
+              return {
+                status: isAuthError ? 401 : 500,
+                json: {
+                  message: isAuthError ? `Profile authentication failed: ${upstreamRes.status} ${text}` : `Profiles failed: ${upstreamRes.status} ${text}`
+                }
+              };
+            }
+            const parseRes = ProfilesResponse.safeParse(await upstreamRes.json());
+            if (!parseRes.success) {
+              return {
+                status: 500,
+                json: {
+                  message: "Could not parse profiles response: " + zodValidationError.fromError(parseRes.error).toString()
+                }
+              };
+            }
+            return {
+              status: 200,
+              json: {
+                profiles: parseRes.data.profiles
+              }
+            };
+          } catch (err) {
+            return {
+              status: 500,
+              json: {
+                message: err instanceof Error ? err.message : "Profiles request failed"
+              }
+            };
           }
         };
+        if (serverOps instanceof ValOpsFS) {
+          return execFetch(getProfileAuthHeaders(authData, null, "application/json"));
+        }
+        if (!options.valSecret) {
+          return {
+            status: 500,
+            json: {
+              message: "Secret is not configured"
+            }
+          };
+        }
+        return withAuth(options.valSecret, cookies, "profiles", data => {
+          return execFetch(getProfileAuthHeaders(authData, data, "application/json"));
+        });
       }
     },
     "/commit-summary": {
@@ -6111,6 +6164,381 @@ const ValServer = (valModules, options, callbacks) => {
         }
       }
     },
+    //#region ai proxy
+    "/ai/initialize": {
+      POST: async req => {
+        const cookies = req.cookies;
+        const auth = getAuth(cookies);
+        if (auth.error) {
+          return {
+            status: 401,
+            json: {
+              message: auth.error
+            }
+          };
+        }
+        if (!options.project) {
+          return {
+            status: 500,
+            json: {
+              message: "Project is not configured"
+            }
+          };
+        }
+        const authDataRes = await getRemoteFileAuth();
+        if (authDataRes.status !== 200) {
+          return {
+            status: 500,
+            json: {
+              message: authDataRes.json.message
+            }
+          };
+        }
+        const authData = authDataRes.json.remoteFileAuth;
+        const execFetch = async headers => {
+          try {
+            const upstreamUrl = `${options.valContentUrl}/v1/${options.project}/ai/initialize`;
+            const upstreamRes = await fetch(upstreamUrl, {
+              method: "POST",
+              headers,
+              body: JSON.stringify({})
+            });
+            if (!upstreamRes.ok) {
+              const text = await upstreamRes.text();
+              return {
+                status: 500,
+                json: {
+                  message: `AI initialize failed: ${upstreamRes.status} ${text}`
+                }
+              };
+            }
+            const json = await upstreamRes.json();
+            const wsUrl = options.valContentUrl.replace(/^https:/, "wss:").replace(/^http:/, "ws:") + `/v1/${options.project}/ai/connect`;
+            return {
+              status: 200,
+              json: {
+                nonce: json.nonce,
+                wsUrl
+              }
+            };
+          } catch (err) {
+            return {
+              status: 500,
+              json: {
+                message: err instanceof Error ? err.message : "AI initialize error"
+              }
+            };
+          }
+        };
+        if (serverOps instanceof ValOpsFS) {
+          return execFetch(getProfileAuthHeaders(authData, null, "application/json"));
+        }
+        if (!options.valSecret) {
+          return {
+            status: 500,
+            json: {
+              message: "Secret is not configured"
+            }
+          };
+        }
+        return withAuth(options.valSecret, cookies, "ai/initialize", data => {
+          return execFetch(getProfileAuthHeaders(authData, data, "application/json"));
+        });
+      }
+    },
+    "/ai/sessions": {
+      GET: async req => {
+        const cookies = req.cookies;
+        const auth = getAuth(cookies);
+        if (auth.error) {
+          return {
+            status: 401,
+            json: {
+              message: auth.error
+            }
+          };
+        }
+        if (!options.project) {
+          return {
+            status: 500,
+            json: {
+              message: "Project is not configured"
+            }
+          };
+        }
+        const authDataRes = await getRemoteFileAuth();
+        if (authDataRes.status !== 200) {
+          return {
+            status: 500,
+            json: {
+              message: authDataRes.json.message
+            }
+          };
+        }
+        const authData = authDataRes.json.remoteFileAuth;
+        const execFetch = async headers => {
+          try {
+            const SessionsResponse = zod.z.object({
+              sessions: zod.z.array(zod.z.object({
+                id: zod.z.string(),
+                name: zod.z.string().nullable(),
+                createdAt: zod.z.string(),
+                updatedAt: zod.z.string()
+              })),
+              nextCursor: zod.z.object({
+                updatedAt: zod.z.string(),
+                id: zod.z.string()
+              }).nullable().optional()
+            });
+            const params = new URLSearchParams();
+            if (req.query.limit) params.set("limit", req.query.limit);
+            if (req.query.cursor_updatedAt) {
+              params.set("cursor_updatedAt", req.query.cursor_updatedAt);
+            }
+            if (req.query.cursor_id) {
+              params.set("cursor_id", req.query.cursor_id);
+            }
+            const qs = params.toString();
+            const upstreamUrl = `${options.valContentUrl}/v1/${options.project}/ai/sessions${qs ? `?${qs}` : ""}`;
+            const upstreamRes = await fetch(upstreamUrl, {
+              headers
+            });
+            if (!upstreamRes.ok) {
+              const text = await upstreamRes.text();
+              return {
+                status: 500,
+                json: {
+                  message: `AI sessions failed: ${upstreamRes.status} ${text}`
+                }
+              };
+            }
+            const json = SessionsResponse.safeParse(await upstreamRes.json());
+            if (!json.success) {
+              return {
+                status: 500,
+                json: {
+                  message: "Could not parse AI sessions response: " + zodValidationError.fromError(json.error).toString()
+                }
+              };
+            }
+            return {
+              status: 200,
+              json: json.data
+            };
+          } catch (err) {
+            return {
+              status: 500,
+              json: {
+                message: err instanceof Error ? err.message : "AI sessions error"
+              }
+            };
+          }
+        };
+        if (serverOps instanceof ValOpsFS) {
+          return execFetch(getProfileAuthHeaders(authData, null, "application/json"));
+        }
+        if (!options.valSecret) {
+          return {
+            status: 500,
+            json: {
+              message: "Secret is not configured"
+            }
+          };
+        }
+        return withAuth(options.valSecret, cookies, "ai/sessions", data => {
+          return execFetch(getProfileAuthHeaders(authData, data, "application/json"));
+        });
+      },
+      PATCH: async req => {
+        const cookies = req.cookies;
+        const auth = getAuth(cookies);
+        if (auth.error) {
+          return {
+            status: 401,
+            json: {
+              message: auth.error
+            }
+          };
+        }
+        if (!options.project) {
+          return {
+            status: 500,
+            json: {
+              message: "Project is not configured"
+            }
+          };
+        }
+        const pathParts = (req.path || "").split("/").filter(Boolean);
+        const sessionId = pathParts[0];
+        if (!sessionId) {
+          return {
+            status: 500,
+            json: {
+              message: "Missing sessionId in path"
+            }
+          };
+        }
+        const authDataRes = await getRemoteFileAuth();
+        if (authDataRes.status !== 200) {
+          return {
+            status: 500,
+            json: {
+              message: authDataRes.json.message
+            }
+          };
+        }
+        const authData = authDataRes.json.remoteFileAuth;
+        const execFetch = async headers => {
+          try {
+            const upstreamUrl = `${options.valContentUrl}/v1/${options.project}/ai/sessions/${encodeURIComponent(sessionId)}`;
+            const upstreamRes = await fetch(upstreamUrl, {
+              method: "PATCH",
+              headers,
+              body: JSON.stringify({
+                name: req.body.name
+              })
+            });
+            if (!upstreamRes.ok) {
+              const text = await upstreamRes.text();
+              return {
+                status: 500,
+                json: {
+                  message: `AI session rename failed: ${upstreamRes.status} ${text}`
+                }
+              };
+            }
+            return {
+              status: 200,
+              json: {}
+            };
+          } catch (err) {
+            return {
+              status: 500,
+              json: {
+                message: err instanceof Error ? err.message : "AI session rename error"
+              }
+            };
+          }
+        };
+        if (serverOps instanceof ValOpsFS) {
+          return execFetch(getProfileAuthHeaders(authData, null, "application/json"));
+        }
+        if (!options.valSecret) {
+          return {
+            status: 500,
+            json: {
+              message: "Secret is not configured"
+            }
+          };
+        }
+        return withAuth(options.valSecret, cookies, "ai/sessions/rename", data => {
+          return execFetch(getProfileAuthHeaders(authData, data, "application/json"));
+        });
+      }
+    },
+    "/ai/messages": {
+      GET: async req => {
+        const cookies = req.cookies;
+        const auth = getAuth(cookies);
+        if (auth.error) {
+          return {
+            status: 401,
+            json: {
+              message: auth.error
+            }
+          };
+        }
+        if (!options.project) {
+          return {
+            status: 500,
+            json: {
+              message: "Project is not configured"
+            }
+          };
+        }
+        const pathParts = (req.path || "").split("/").filter(Boolean);
+        const sessionId = pathParts[0];
+        if (!sessionId) {
+          return {
+            status: 500,
+            json: {
+              message: "Missing sessionId in path"
+            }
+          };
+        }
+        const authDataRes = await getRemoteFileAuth();
+        if (authDataRes.status !== 200) {
+          return {
+            status: 500,
+            json: {
+              message: authDataRes.json.message
+            }
+          };
+        }
+        const authData = authDataRes.json.remoteFileAuth;
+        const execFetch = async headers => {
+          try {
+            const SessionMessagesResponse = zod.z.object({
+              messages: zod.z.array(zod.z.object({
+                role: zod.z.string(),
+                content: zod.z.string()
+              })),
+              nextCursor: zod.z.object({
+                updatedAt: zod.z.string(),
+                id: zod.z.string()
+              }).nullable().optional()
+            });
+            const upstreamUrl = `${options.valContentUrl}/v1/${options.project}/ai/sessions/${encodeURIComponent(sessionId)}/messages`;
+            const upstreamRes = await fetch(upstreamUrl, {
+              headers
+            });
+            if (!upstreamRes.ok) {
+              const text = await upstreamRes.text();
+              return {
+                status: 500,
+                json: {
+                  message: `AI session messages failed: ${upstreamRes.status} ${text}`
+                }
+              };
+            }
+            const json = SessionMessagesResponse.safeParse(await upstreamRes.json());
+            if (!json.success) {
+              return {
+                status: 500,
+                json: {
+                  message: "Could not parse AI session messages response: " + zodValidationError.fromError(json.error).toString()
+                }
+              };
+            }
+            return {
+              status: 200,
+              json: json.data
+            };
+          } catch (err) {
+            return {
+              status: 500,
+              json: {
+                message: err instanceof Error ? err.message : "AI session messages error"
+              }
+            };
+          }
+        };
+        if (serverOps instanceof ValOpsFS) {
+          return execFetch(getProfileAuthHeaders(authData, null, "application/json"));
+        }
+        if (!options.valSecret) {
+          return {
+            status: 500,
+            json: {
+              message: "Secret is not configured"
+            }
+          };
+        }
+        return withAuth(options.valSecret, cookies, "ai/sessions/messages", data => {
+          return execFetch(getProfileAuthHeaders(authData, data, "application/json"));
+        });
+      }
+    },
     //#region files
     "/files": {
       GET: async req => {
@@ -6332,6 +6760,21 @@ async function withAuth(secret, cookies, errorMessageType, handler) {
     };
   }
 }
+function getProfileAuthHeaders(auth, data, type) {
+  if ("pat" in auth) {
+    return {
+      "x-val-pat": auth.pat,
+      "Content-Type": type
+    };
+  }
+  if ("apiKey" in auth && data) {
+    return {
+      ...getAuthHeaders(auth.apiKey, type),
+      "x-val-profile-id": data.sub
+    };
+  }
+  throw new Error("Invalid auth");
+}
 function getAuthHeaders(token, type) {
   if (!type) {
     return {