updates

Author: Shaw

packages/agent/src/services/remote-plugin-adapter.test.ts

@@ -2683,6 +2683,8 @@ process.on("SIGTERM", () => server.close(() => process.exit(0)));
 
       const viewSource = join(srcDir, "docker-view.ts");
       const builtBundlePath = join(distDir, "docker-view.js");
+      const toolsViewSource = join(srcDir, "docker-tools-view.ts");
+      const builtToolsBundlePath = join(distDir, "docker-tools-view.js");
       await writeFile(
         viewSource,
         [
@@ -2692,9 +2694,19 @@ process.on("SIGTERM", () => server.close(() => process.exit(0)));
         ].join("\n"),
         "utf8",
       );
+      await writeFile(
+        toolsViewSource,
+        [
+          "export const marker = 'docker-tools-built-remote-view';",
+          "export const isolation = 'docker';",
+          "export const module = 'tools';",
+          "",
+        ].join("\n"),
+        "utf8",
+      );
       const buildResult = await esbuild({
-        entryPoints: [viewSource],
-        outfile: builtBundlePath,
+        entryPoints: [viewSource, toolsViewSource],
+        outdir: distDir,
         target: "es2022",
         platform: "browser",
         format: "esm",

plugins/plugin-local-inference/native/llama.cpp

@@ -1006,7 +1006,14 @@ async function startTextServer(engine, files, args, log) {
     logText += chunk.toString();
     if (logText.length > 20000) logText = logText.slice(-20000);
   });
-  await waitHealthy(port, args.startTimeoutS, child);
+  try {
+    await waitHealthy(port, args.startTimeoutS, child);
+  } catch (err) {
+    err.serverLog = logText;
+    err.serverExitCode = child.exitCode ?? null;
+    await stopChild(child);
+    throw err;
+  }
   return { child, port, drafterReady, getLog: () => logText };
 }
 
@@ -1670,8 +1677,11 @@ async function run() {
         status: statusFromError(err),
         reason: err instanceof Error ? err.message : String(err),
         e2eLoopOk: false,
-        serverExitCode: textServer?.child?.exitCode ?? null,
-        serverLog: textServer?.getLog ? textServer.getLog().split("\n").slice(-100).join("\n") : null,
+        serverExitCode: err?.serverExitCode ?? textServer?.child?.exitCode ?? null,
+        serverLog: (err?.serverLog ?? (textServer?.getLog ? textServer.getLog() : null))
+          ?.split("\n")
+          .slice(-100)
+          .join("\n") ?? null,
       },
       args,
     );