veryfront 0.1.152 → 0.1.155

package/src/src/agent/runtime/index.ts

@@ -100,6 +100,7 @@ import {
 } from "../../skill/allowed-tools.js";
 import { resolveConfiguredAgentModel, resolveRuntimeModel } from "./model-resolution.js";
 import type { RuntimeGenerateToolResult } from "./runtime-tool-types.js";
+import { stringifyToolError, throwIfAborted } from "./error-utils.js";
 
 const logger = serverLogger.component("agent");
 const LOAD_SKILL_TOOL_ID = "load-skill";
@@ -108,23 +109,6 @@ type RuntimeToolFilterConfig = AgentConfig & {
   __vfAllowedRemoteTools?: string[];
 };
 
-function createAbortError(reason?: unknown): Error {
-  if (reason instanceof Error) {
-    return reason;
-  }
-
-  return new DOMException(
-    typeof reason === "string" && reason.length > 0 ? reason : "The operation was aborted",
-    "AbortError",
-  );
-}
-
-function throwIfAborted(abortSignal?: AbortSignal): void {
-  if (abortSignal?.aborted) {
-    throw createAbortError(abortSignal.reason);
-  }
-}
-
 function isAbortError(error: unknown, abortSignal?: AbortSignal): boolean {
   if (abortSignal?.aborted && error === abortSignal.reason) {
     return true;
@@ -133,22 +117,6 @@ function isAbortError(error: unknown, abortSignal?: AbortSignal): boolean {
   return error instanceof DOMException && error.name === "AbortError";
 }
 
-function stringifyToolError(error: unknown): string {
-  if (typeof error === "string" && error.length > 0) {
-    return error;
-  }
-
-  if (error instanceof Error && typeof error.message === "string" && error.message.length > 0) {
-    return error.message;
-  }
-
-  try {
-    return JSON.stringify(error);
-  } catch {
-    return String(error);
-  }
-}
-
 function getToolResultError(result: unknown): string | undefined {
   if (!result || typeof result !== "object" || !("error" in result)) {
     return undefined;

package/src/src/observability/error-collector.ts

@@ -150,6 +150,16 @@ export class ErrorCollector {
     return this.addTypedError("runtime", message, { stack, context, slug });
   }
 
+  private addFileContextError(
+    type: "bundle" | "hmr" | "module",
+    message: string,
+    file?: string,
+    context?: Record<string, unknown>,
+    slug?: string,
+  ): DevError {
+    return this.addTypedError(type, message, { file, context, slug });
+  }
+
   /**
    * Add a bundle error
    * @param message Error message
@@ -163,7 +173,7 @@ export class ErrorCollector {
     context?: Record<string, unknown>,
     slug?: string,
   ): DevError {
-    return this.addTypedError("bundle", message, { file, context, slug });
+    return this.addFileContextError("bundle", message, file, context, slug);
   }
 
   /**
@@ -179,7 +189,7 @@ export class ErrorCollector {
     context?: Record<string, unknown>,
     slug?: string,
   ): DevError {
-    return this.addTypedError("hmr", message, { file, context, slug });
+    return this.addFileContextError("hmr", message, file, context, slug);
   }
 
   /**
@@ -195,7 +205,7 @@ export class ErrorCollector {
     context?: Record<string, unknown>,
     slug?: string,
   ): DevError {
-    return this.addTypedError("module", message, { file, context, slug });
+    return this.addFileContextError("module", message, file, context, slug);
   }
 
   getAll(filter?: ErrorFilter): DevError[] {

package/src/src/routing/api/module-loader/loader.ts

@@ -355,31 +355,45 @@ function createImportMapPlugin(
 
       build.onLoad(
         { filter: /.*/, namespace: "import-map" },
-        wrapWithCurrentContext(async (args) => {
-          try {
-            const { filePath, contents } = await readFileWithExtensions(
-              adapter,
-              args.path,
-              FILE_EXTENSIONS,
-              projectDir,
-            );
-
-            return {
-              contents,
-              loader: getLoaderForFile(filePath),
-              resolveDir: pathHelper.dirname(filePath),
-            };
-          } catch (error) {
-            const msg = error instanceof Error ? error.message : String(error);
-            logger.error(`Failed to load file via import map: ${args.path}`, error);
-            return { errors: [{ text: `Failed to load: ${msg}` }] };
-          }
+        createNamespaceOnLoadHandler({
+          adapter,
+          projectDir,
+          errorLabel: "file via import map",
         }),
       );
     },
   };
 }
 
+function createNamespaceOnLoadHandler(options: {
+  adapter: RuntimeAdapter;
+  projectDir: string;
+  errorLabel: string;
+}) {
+  const { adapter, projectDir, errorLabel } = options;
+
+  return wrapWithCurrentContext(async (args: { path: string }) => {
+    try {
+      const { filePath, contents } = await readFileWithExtensions(
+        adapter,
+        args.path,
+        FILE_EXTENSIONS,
+        projectDir,
+      );
+
+      return {
+        contents,
+        loader: getLoaderForFile(filePath),
+        resolveDir: pathHelper.dirname(filePath),
+      };
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      logger.error(`Failed to load ${errorLabel}: ${args.path}`, error);
+      return { errors: [{ text: `Failed to load: ${msg}` }] };
+    }
+  });
+}
+
 /** Resolves relative imports through the adapter's virtual FS for remote projects. */
 function createAdapterResolvePlugin(
   adapter: RuntimeAdapter,
@@ -420,25 +434,10 @@ function createAdapterResolvePlugin(
       // cannot resolve the per-project adapter and all file reads fail silently.
       build.onLoad(
         { filter: /.*/, namespace: "vf-adapter" },
-        wrapWithCurrentContext(async (args) => {
-          try {
-            const { filePath, contents } = await readFileWithExtensions(
-              adapter,
-              args.path,
-              FILE_EXTENSIONS,
-              projectDir,
-            );
-
-            return {
-              contents,
-              loader: getLoaderForFile(filePath),
-              resolveDir: pathHelper.dirname(filePath),
-            };
-          } catch (error) {
-            const msg = error instanceof Error ? error.message : String(error);
-            logger.error(`Failed to load via adapter: ${args.path}`, error);
-            return { errors: [{ text: `Failed to load: ${msg}` }] };
-          }
+        createNamespaceOnLoadHandler({
+          adapter,
+          projectDir,
+          errorLabel: "via adapter",
         }),
       );
     },

package/src/src/utils/version-constant.ts

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.152";
+export const VERSION = "0.1.155";