fix(merge): resolve dev conflicts for openclaw branch

This commit is contained in:
GeonWoo Jeon (Jay)
2026-04-09 12:23:38 +09:00
177 changed files with 5633 additions and 483 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
import * as z from "zod"
import { z } from "zod"
import { OhMyOpenCodeConfigSchema } from "../src/config/schema"
export function createOhMyOpenCodeJsonSchema(): Record<string, unknown> {
@@ -8,10 +8,10 @@ export function createOhMyOpenCodeJsonSchema(): Record<string, unknown> {
}) as Record<string, unknown>
return {
...jsonSchema,
$schema: "http://json-schema.org/draft-07/schema#",
$id: "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
title: "Oh My OpenCode Configuration",
description: "Configuration schema for oh-my-opencode plugin",
...jsonSchema,
}
}
+1 -1
View File
@@ -15,7 +15,7 @@ describe("test workflows", () => {
const workflow = readFileSync(workflowPath, "utf8")
expect(workflow).toContain("- name: Run tests")
expect(workflow).toContain("run: bun test")
expect(workflow).toMatch(/run: bun (test|run script\/run-ci-tests\.ts)/)
}
})
})