fix portable packaging and smoke timeout cleanup

Author: vicary

packaging.test.ts

@@ -88,6 +88,13 @@ Deno.test({
 
     const tempDir = await Deno.makeTempDir();
     try {
+      let optionalOpenCodePath: string | undefined;
+      try {
+        optionalOpenCodePath = Deno.env.get("OPENCODE_BIN") ?? undefined;
+      } catch {
+        optionalOpenCodePath = undefined;
+      }
+
       const esmRunnerPath = join(tempDir, "load-esm.mjs");
       const bunRunnerPath = join(tempDir, "load-bun.mjs");
       const esmEntrypoint =
@@ -124,30 +131,34 @@ Deno.test({
         assertEquals(bunLoad.stdout.trim(), '["graphiti"]');
       }
 
-      const localOpenCodePath = "/Users/vicary/.opencode/bin/opencode";
-      try {
-        const opencodeInfo = await Deno.stat(localOpenCodePath);
-        if (opencodeInfo.isFile) {
-          const isolatedOpenCode = await new Deno.Command(localOpenCodePath, {
-            args: ["--print-logs", "stats"],
-            cwd: workspacePath,
-            env: {
-              HOME: isolatedHome,
-              XDG_CONFIG_HOME: join(isolatedHome, ".config"),
-            },
-            stdout: "piped",
-            stderr: "piped",
-          }).output();
-          const isolatedOpenCodeOutput = decodeText(isolatedOpenCode.stdout) +
-            decodeText(isolatedOpenCode.stderr);
-          assertEquals(
-            isolatedOpenCodeOutput.includes("Missing 'default' export"),
-            false,
-            isolatedOpenCodeOutput,
-          );
+      if (optionalOpenCodePath) {
+        try {
+          const opencodeInfo = await Deno.stat(optionalOpenCodePath);
+          if (opencodeInfo.isFile) {
+            const isolatedOpenCode = await new Deno.Command(
+              optionalOpenCodePath,
+              {
+                args: ["--print-logs", "stats"],
+                cwd: workspacePath,
+                env: {
+                  HOME: isolatedHome,
+                  XDG_CONFIG_HOME: join(isolatedHome, ".config"),
+                },
+                stdout: "piped",
+                stderr: "piped",
+              },
+            ).output();
+            const isolatedOpenCodeOutput = decodeText(isolatedOpenCode.stdout) +
+              decodeText(isolatedOpenCode.stderr);
+            assertEquals(
+              isolatedOpenCodeOutput.includes("Missing 'default' export"),
+              false,
+              isolatedOpenCodeOutput,
+            );
+          }
+        } catch {
+          // OPENCODE_BIN is optional; keep the portable package checks above.
         }
-      } catch {
-        // OpenCode is not available in CI; keep the portable package checks above.
       }
     } finally {
       await Deno.remove(tempDir, { recursive: true }).catch(() => undefined);

src/services/runtime-teardown.smoke.test.ts

@@ -45,6 +45,7 @@ const waitForText = async (
   stream: ReadableStream<Uint8Array> | null,
   expected: string,
   timeoutMs: number,
+  onTimeout?: () => void,
 ): Promise<{
   seen: string;
   remainder: Promise<string>;
@@ -69,6 +70,7 @@ const waitForText = async (
       })(),
       new Promise<never>((_, reject) => {
         timeoutId = setTimeout(() => {
+          onTimeout?.();
           void reader.cancel();
           reject(
             new Error(`timed out waiting for ${JSON.stringify(expected)}`),
@@ -115,7 +117,18 @@ Deno.test({
       stderr: "piped",
     }).spawn();
 
-    const stdoutState = await waitForText(child.stdout, "ready\n", 2_000);
+    const stdoutState = await waitForText(
+      child.stdout,
+      "ready\n",
+      2_000,
+      () => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+          // Best-effort cleanup only.
+        }
+      },
+    );
     const stderrPromise = new Response(child.stderr).text();
 
     child.kill("SIGINT");