romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/poe-provider

Browse Source
This commit is contained in:
Gareth Jones 2026-01-26 22:33:38 -08:00
commit 547ba23bda
5 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -277,6 +277,8 @@ jobs:
checks-macos: checks-macos:
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
runs-on: macos-latest runs-on: macos-latest
env:
NODE_OPTIONS: --max-old-space-size=4096
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:

2
pnpm-lock.yaml generated
View File

@ -409,6 +409,8 @@ importers:
extensions/open-prose: {} extensions/open-prose: {}
extensions/poe: {}
extensions/signal: {} extensions/signal: {}
extensions/slack: {} extensions/slack: {}

14
scripts/bundle-a2ui.sh
View File

@ -30,10 +30,20 @@ collect_files() {
} }
compute_hash() { compute_hash() {
# Use sha256sum on Linux/Windows (Git Bash), shasum on macOS
local sha_cmd
if command -v sha256sum &>/dev/null; then
sha_cmd="sha256sum"
elif command -v shasum &>/dev/null; then
sha_cmd="shasum -a 256"
else
echo "No sha256 tool found (sha256sum or shasum)" >&2
exit 1
fi
collect_files \ collect_files \
| LC_ALL=C sort -z \ | LC_ALL=C sort -z \
| xargs -0 shasum -a 256 \ | xargs -0 $sha_cmd \
| shasum -a 256 \ | $sha_cmd \
| awk '{print $1}' | awk '{print $1}'
} }

31
src/canvas-host/a2ui.ts
View File

@ -12,6 +12,31 @@ export const CANVAS_WS_PATH = "/__clawdbot/ws";
let cachedA2uiRootReal: string | null | undefined; let cachedA2uiRootReal: string | null | undefined;
let resolvingA2uiRoot: Promise<string | null> | null = null; let resolvingA2uiRoot: Promise<string | null> | null = null;
/** Reset the A2UI root cache (for testing). */
export function resetA2uiCache(): void {
cachedA2uiRootReal = undefined;
resolvingA2uiRoot = null;
}
async function findRepoRoot(startDir: string): Promise<string | null> {
let dir = startDir;
for (let i = 0; i < 10; i++) {
try {
const pkgPath = path.join(dir, "package.json");
await fs.stat(pkgPath);
// Verify it's the clawdbot package
const pkg = JSON.parse(await fs.readFile(pkgPath, "utf8"));
if (pkg.name === "clawdbot") return dir;
} catch {
// not found, go up
}
const parent = path.dirname(dir);
if (parent === dir) break;
dir = parent;
}
return null;
}
async function resolveA2uiRoot(): Promise<string | null> { async function resolveA2uiRoot(): Promise<string | null> {
const here = path.dirname(fileURLToPath(import.meta.url)); const here = path.dirname(fileURLToPath(import.meta.url));
const candidates = [ const candidates = [
@ -26,6 +51,12 @@ async function resolveA2uiRoot(): Promise<string | null> {
if (process.execPath) { if (process.execPath) {
candidates.unshift(path.resolve(path.dirname(process.execPath), "a2ui")); candidates.unshift(path.resolve(path.dirname(process.execPath), "a2ui"));
} }
// Find repo root by walking up from `here` (handles vitest/vite transforms).
const repoRoot = await findRepoRoot(here);
if (repoRoot) {
candidates.push(path.resolve(repoRoot, "src/canvas-host/a2ui"));
candidates.push(path.resolve(repoRoot, "dist/canvas-host/a2ui"));
}
for (const dir of candidates) { for (const dir of candidates) {
try { try {

12
src/canvas-host/server.test.ts
View File

@ -3,14 +3,22 @@ import { createServer } from "node:http";
import type { AddressInfo } from "node:net"; import type { AddressInfo } from "node:net";
import os from "node:os"; import os from "node:os";
import path from "node:path"; import path from "node:path";
import { describe, expect, it, vi } from "vitest"; import { beforeEach, describe, expect, it, vi } from "vitest";
import { WebSocket } from "ws"; import { WebSocket } from "ws";
import { rawDataToString } from "../infra/ws.js"; import { rawDataToString } from "../infra/ws.js";
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import { CANVAS_HOST_PATH, CANVAS_WS_PATH, injectCanvasLiveReload } from "./a2ui.js"; import {
CANVAS_HOST_PATH,
CANVAS_WS_PATH,
injectCanvasLiveReload,
resetA2uiCache,
} from "./a2ui.js";
import { createCanvasHostHandler, startCanvasHost } from "./server.js"; import { createCanvasHostHandler, startCanvasHost } from "./server.js";
describe("canvas host", () => { describe("canvas host", () => {
beforeEach(() => {
resetA2uiCache();
});
it("injects live reload script", () => { it("injects live reload script", () => {
const out = injectCanvasLiveReload("<html><body>Hello</body></html>"); const out = injectCanvasLiveReload("<html><body>Hello</body></html>");
expect(out).toContain(CANVAS_WS_PATH); expect(out).toContain(CANVAS_WS_PATH);