@fungi.computer/bonsai 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @fungi.computer/bonsai
 
+## 0.2.4
+
+### Patch Changes
+
+- Changes since 0.2.3:
+
+  - fix(oyster): ship starter dependencies and continue failed installs
+  - fix(oyster): bound builder failures and interrupt lost builds
+
+- Updated dependencies
+- Updated dependencies
+  - @fungi.computer/oyster@0.4.1
+  - @fungi.computer/trellis@0.2.3
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+- Updated dependencies
+  - @fungi.computer/caps@0.3.0
+  - @fungi.computer/issues@0.2.0
+  - @fungi.computer/oyster@0.4.0
+  - @fungi.computer/agar@0.3.1
+  - @fungi.computer/trellis@0.2.2
+  - @fungi.computer/braid@0.2.2
+  - @fungi.computer/nacre@0.0.2
+  - @fungi.computer/workflows-wire@0.2.2
+
 ## 0.2.2
 
 ### Patch Changes

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@fungi.computer/bonsai",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "author": "Levi <levi@technomancy.dev>",
   "type": "module",
   "description": "Bonsai: a git platform for many agents working at once, on Workers and Artifacts",
   "dependencies": {
-    "@fungi.computer/agar": "0.3.0",
-    "@fungi.computer/caps": "0.2.0",
-    "@fungi.computer/issues": "0.1.0",
-    "@fungi.computer/oyster": "0.3.2",
+    "@fungi.computer/agar": "0.3.1",
+    "@fungi.computer/caps": "0.3.0",
+    "@fungi.computer/issues": "0.2.0",
+    "@fungi.computer/oyster": "0.4.1",
     "@fungi.computer/puffball": "0.2.0",
     "@fungi.computer/sigils": "0.2.0",
     "@fungi.computer/stipe": "0.1.0",
@@ -29,10 +29,10 @@
     "@fungi.computer/maosaico": "0.1.0",
     "@visx/hierarchy": "3.12.0",
     "@fungi.computer/gills": "0.2.0",
-    "@fungi.computer/nacre": "0.0.1",
-    "@fungi.computer/trellis": "0.2.1",
-    "@fungi.computer/braid": "0.2.1",
-    "@fungi.computer/workflows-wire": "0.2.1"
+    "@fungi.computer/nacre": "0.0.2",
+    "@fungi.computer/trellis": "0.2.3",
+    "@fungi.computer/braid": "0.2.2",
+    "@fungi.computer/workflows-wire": "0.2.2"
   },
   "devDependencies": {
     "playwright": "1.62.1",
@@ -52,7 +52,7 @@
     "eslint": "10.9.1",
     "oxlint": "1.78.0",
     "jsdom": "29.0.1",
-    "@fungi.computer/computer-contract": "0.0.2"
+    "@fungi.computer/computer-contract": "0.0.3"
   },
   "botanical": {
     "role": "app",
@@ -176,7 +176,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint backend web shared test --max-warnings=0 && oxlint --config ../../oxlint.config.ts --deny-warnings backend web shared test",
     "test": "pnpm run test:unit && pnpm run test:merge",
-    "test:unit": "vitest run && node --import tsx --test test/seed-resume.test.mjs test/insight-layout.test.mjs test/checks-workflow-template.test.mjs test/merge-template-build.test.mjs test/storyboard-save-template.test.mjs test/favicon.test.mjs",
+    "test:unit": "vitest run && node --import tsx --test test/seed-resume.test.mjs test/insight-layout.test.mjs test/checks-workflow-template.test.mjs test/merge-template-build.test.mjs test/storyboard-save-template.test.mjs test/favicon.test.mjs test/packed-trellis.test.mjs",
     "test:merge": "node --import tsx test/git-push.native.mjs",
     "format:check": "node ../../tooling/repository/scripts/format-package-check.mjs",
     "lint:anti-slop": "node ../../tooling/repository/scripts/lint-package-anti-slop.mjs",

package/shared/contract.ts

@@ -420,7 +420,7 @@ export const appBuildView = z.strictObject({
   appId: z.string().min(1).max(256),
   releaseId: z.string().min(1).max(256),
   sourceRevision: z.string().min(1).max(256),
-  status: z.enum(["running", "succeeded", "failed", "revoked"]),
+  status: z.enum(["running", "succeeded", "failed", "interrupted", "revoked"]),
   detail: z.string().max(65_536).nullable(),
   /** The recorded Release, parsed by its owner where it is installed. */
   release: z.unknown(),

package/test/packed-trellis.test.mjs

@@ -0,0 +1,138 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join, posix, resolve } from "node:path";
+import test from "node:test";
+import ts from "typescript";
+
+const root = resolve(import.meta.dirname, "../../..");
+
+test("packed Bonsai imports and Tailwind sources stay in its snapshot and packed Trellis", () => {
+  const out = mkdtempSync(join(tmpdir(), "bonsai-pack-"));
+  try {
+    const packed = (name) => {
+      const archive = execFileSync(
+        "pnpm",
+        ["--dir", `apps/${name}`, "pack", "--pack-destination", out],
+        { cwd: root, encoding: "utf8" },
+      )
+        .trim()
+        .split("\n")
+        .at(-1);
+      assert.ok(archive, `${name} packed`);
+      const paths = new Set(
+        execFileSync("tar", ["tzf", archive], { encoding: "utf8" })
+          .trim()
+          .split("\n")
+          .map((path) => path.replace(/^package\//u, "")),
+      );
+      const read = (path) =>
+        execFileSync("tar", ["xOzf", archive, `package/${path}`], {
+          encoding: "utf8",
+        });
+      return { paths, read };
+    };
+    const bonsai = packed("bonsai");
+    const trellis = packed("trellis");
+    const packages = { bonsai, trellis };
+    const source = (name, path) => {
+      const archive = packages[name];
+      assert.ok(archive, name);
+      assert.ok(archive.paths.has(path), `${name} ships ${path}`);
+      return archive.read(path);
+    };
+    const resolveSource = (name, from, specifier) => {
+      let path;
+      let owner = name;
+      if (specifier.startsWith("@fungi.computer/trellis/")) {
+        owner = "trellis";
+        const exportName = `./${specifier.slice("@fungi.computer/trellis/".length)}`;
+        const target = JSON.parse(source("trellis", "package.json")).exports[
+          exportName
+        ];
+        assert.ok(target, `Trellis exports ${exportName}`);
+        path = target.replace(/^\.\//u, "");
+      } else {
+        path = posix.normalize(posix.join(posix.dirname(from), specifier));
+        assert.ok(
+          !path.startsWith("../"),
+          `${name}/${from}: ${specifier} escapes`,
+        );
+      }
+      const found = [
+        path,
+        `${path}.ts`,
+        `${path}.tsx`,
+        `${path}.json`,
+        path.replace(/\.js$/u, ".ts"),
+        path.replace(/\.js$/u, ".tsx"),
+        posix.join(path, "index.ts"),
+      ].find((candidate) => packages[owner].paths.has(candidate));
+      assert.ok(
+        found,
+        `${name}/${from}: ${specifier} must be shipped by ${owner}`,
+      );
+      return [owner, found];
+    };
+    const visited = new Set();
+    const inspect = (name, path) => {
+      if (visited.has(`${name}/${path}`)) return;
+      visited.add(`${name}/${path}`);
+      const text = source(name, path);
+      if (path.endsWith(".css")) {
+        for (const [, specifier] of text.matchAll(/@source\s+"([^"]+)"/gu)) {
+          if (specifier === "./") continue;
+          if (specifier.startsWith("./") || specifier.startsWith("../")) {
+            const directory = posix.normalize(
+              posix.join(posix.dirname(path), specifier),
+            );
+            assert.ok(
+              !directory.startsWith("../"),
+              `${name}/${path}: @source escapes snapshot`,
+            );
+            const dependency = "node_modules/@fungi.computer/trellis/";
+            const owner = directory.startsWith(dependency) ? "trellis" : name;
+            const target =
+              owner === "trellis"
+                ? directory.slice(dependency.length)
+                : directory;
+            assert.ok(
+              [...packages[owner].paths].some(
+                (file) => file.startsWith(`${target}/`) || file === target,
+              ),
+              `${name}/${path}: @source ${specifier} has no shipped files`,
+            );
+          } else {
+            assert.fail(`${name}/${path}: unsupported @source ${specifier}`);
+          }
+        }
+        return;
+      }
+      const ast = ts.createSourceFile(path, text, ts.ScriptTarget.Latest, true);
+      const visit = (node) => {
+        const specifier =
+          ts.isImportDeclaration(node) || ts.isExportDeclaration(node)
+            ? node.moduleSpecifier
+            : undefined;
+        if (
+          specifier &&
+          ts.isStringLiteral(specifier) &&
+          (specifier.text.startsWith(".") ||
+            specifier.text.startsWith("@fungi.computer/trellis/"))
+        ) {
+          const [owner, target] = resolveSource(name, path, specifier.text);
+          if (/\.(?:ts|tsx|js|css)$/u.test(target)) inspect(owner, target);
+        }
+        ts.forEachChild(node, visit);
+      };
+      visit(ast);
+    };
+    for (const path of bonsai.paths) {
+      if (/^(web|backend|shared)\/.*\.(?:ts|tsx|css)$/u.test(path))
+        inspect("bonsai", path);
+    }
+  } finally {
+    rmSync(out, { recursive: true, force: true });
+  }
+});

package/web/app-build-panel.tsx

@@ -236,6 +236,11 @@ export function AppBuildPanel({ repo }: { repo: string }) {
                   : ""}
               </p>
             )}
+            {settled?.status === "interrupted" ? (
+              <p role="status">
+                Build interrupted. Start a new build to retry.
+              </p>
+            ) : null}
             {status.isError ? <p role="alert">{status.error.message}</p> : null}
             {settled?.installation?.kind === "needs_consent" ? (
               <p role="status">

package/web/bonsai.css

@@ -1,4 +1,4 @@
-@source "../../trellis/src/runs";
+@source "../node_modules/@fungi.computer/trellis/src/runs";
 @import "@fungi.computer/caps/tailwind.css";
 @source "./";