Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
[codex] remove duplicated pnpm root config (#2939)
Julius Marminge37bf0f0d1d3c
diff --git a/apps/server/scripts/cli.ts b/apps/server/scripts/cli.tsindex ce8e813b8..63a8d1e9f 100644--- a/apps/server/scripts/cli.ts+++ b/apps/server/scripts/cli.ts@@ -17,8 +17,8 @@ import {} from "../../../scripts/lib/brand-assets.ts";import { resolveCatalogDependencies } from "../../../scripts/lib/resolve-catalog.ts";import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";+import { fromYaml } from "@t3tools/shared/schemaYaml";import serverPackageJson from "../package.json" with { type: "json" };-import { parse as parseYaml } from "yaml";interface PackageJson {name: string;@@ -39,10 +39,12 @@ interface PackageJson {const PackageJsonPrettyJson = fromJsonStringPretty(Schema.Unknown);const encodePackageJson = Schema.encodeEffect(PackageJsonPrettyJson);-interface WorkspaceConfig {- readonly catalog?: Record<string, string>;- readonly overrides?: Record<string, string>;-}+const WorkspaceConfig = Schema.Struct({+ catalog: Schema.optional(Schema.Record(Schema.String, Schema.String)),+ overrides: Schema.optional(Schema.Record(Schema.String, Schema.String)),+});+type WorkspaceConfig = typeof WorkspaceConfig.Type;+const decodeWorkspaceConfig = Schema.decodeEffect(fromYaml(WorkspaceConfig));class CliError extends Data.TaggedError("CliError")<{readonly message: string;@@ -58,7 +60,7 @@ const readWorkspaceConfig = Effect.fn("readWorkspaceConfig")(function* () {const fs = yield* FileSystem.FileSystem;const repoRoot = yield* RepoRoot;const workspaceYaml = yield* fs.readFileString(path.join(repoRoot, "pnpm-workspace.yaml"));- return parseYaml(workspaceYaml) as WorkspaceConfig;+ return yield* decodeWorkspaceConfig(workspaceYaml);});const runCommand = Effect.fn("runCommand")(function* (command: ChildProcess.Command) {diff --git a/package.json b/package.jsonindex 81ca5a2a7..85a231554 100644--- a/package.json+++ b/package.json@@ -1,35 +1,6 @@{"name": "@t3tools/monorepo","private": true,- "workspaces": {- "packages": [- "apps/*",- "oxlint-plugin-t3code",- "packages/*",- "scripts"- ],- "catalog": {- "effect": "4.0.0-beta.73",- "@effect/atom-react": "4.0.0-beta.73",- "@effect/openapi-generator": "4.0.0-beta.73",- "@effect/platform-bun": "4.0.0-beta.73",- "@effect/platform-node": "4.0.0-beta.73",- "@effect/platform-node-shared": "4.0.0-beta.73",- "@effect/sql-sqlite-bun": "4.0.0-beta.73",- "@effect/vitest": "4.0.0-beta.73",- "@effect/tsgo": "0.11.4",- "@pierre/diffs": "1.1.20",- "@vitest/runner": "^4.1.8",- "@types/bun": "^1.3.11",- "@types/node": "24.12.4",- "@typescript/native-preview": "7.0.0-dev.20260527.2",- "typescript": "~6.0.3",- "vitest": "npm:@voidzero-dev/vite-plus-test@latest",- "vite": "npm:@voidzero-dev/vite-plus-core@latest",- "vite-plus": "latest",- "yaml": "^2.9.0"- }- },"type": "module","scripts": {"prepare": "vp config && effect-tsgo patch",@@ -75,19 +46,6 @@"@vitest/runner": "catalog:","vite": "catalog:","vite-plus": "catalog:",- "vitest": "catalog:",- "yaml": "catalog:"- },- "overrides": {- "@effect/atom-react": "catalog:",- "@effect/platform-bun": "catalog:",- "@effect/platform-node": "catalog:",- "@effect/platform-node-shared": "catalog:",- "@effect/sql-sqlite-bun": "catalog:",- "@effect/vitest": "catalog:",- "@types/node": "catalog:",- "effect": "catalog:",- "vite": "catalog:","vitest": "catalog:"},"engines": {@@ -98,11 +56,5 @@"workerDirectory": ["apps/web/public"]- },- "patchedDependencies": {- "@expo/[email protected]": "patches/@expo%[email protected]",- "@pierre/[email protected]@1.1.20": "patches/@pierre%[email protected]",- "[email protected]@4.0.0-beta.73": "patches/[email protected]",- "[email protected]@0.35.9": "patches/[email protected]"}}diff --git a/packages/shared/package.json b/packages/shared/package.jsonindex 873b8e4c2..ea4233a9d 100644--- a/packages/shared/package.json+++ b/packages/shared/package.json@@ -51,6 +51,10 @@"types": "./src/schemaJson.ts","import": "./src/schemaJson.ts"},+ "./schemaYaml": {+ "types": "./src/schemaYaml.ts",+ "import": "./src/schemaYaml.ts"+ },"./toolActivity": {"types": "./src/toolActivity.ts","import": "./src/toolActivity.ts"@@ -118,7 +122,8 @@},"dependencies": {"@t3tools/contracts": "workspace:*",- "effect": "catalog:"+ "effect": "catalog:",+ "yaml": "catalog:"},"devDependencies": {"@effect/platform-node": "catalog:",diff --git a/packages/shared/src/schemaYaml.test.ts b/packages/shared/src/schemaYaml.test.tsnew file mode 100644index 000000000..7b5a23acb--- /dev/null+++ b/packages/shared/src/schemaYaml.test.ts@@ -0,0 +1,58 @@+import * as Schema from "effect/Schema";+import { describe, expect, it } from "vite-plus/test";++import { fromYaml, fromYamlString } from "./schemaYaml.ts";++const ProjectConfig = Schema.Struct({+ name: Schema.String,+ enabled: Schema.Boolean,+ tags: Schema.Array(Schema.String),+});++describe("schemaYaml helpers", () => {+ it("decodes YAML through a schema", () => {+ const decodeConfig = Schema.decodeUnknownSync(fromYaml(ProjectConfig));++ expect(+ decodeConfig(`name: t3code+enabled: true+tags:+ - codex+ - effect+`),+ ).toEqual({+ name: "t3code",+ enabled: true,+ tags: ["codex", "effect"],+ });+ });++ it("encodes values as YAML text", () => {+ const encodeConfig = Schema.encodeSync(fromYaml(ProjectConfig));++ expect(+ encodeConfig({+ name: "t3code",+ enabled: true,+ tags: ["codex"],+ }),+ ).toBe(`name: t3code+enabled: true+tags:+ - codex+`);+ });++ it("can be used as a schema transformation directly", () => {+ const schema = Schema.String.pipe(Schema.decodeTo(Schema.Unknown, fromYamlString));+ const decodeYaml = Schema.decodeUnknownSync(schema);++ expect(decodeYaml("answer: 42\n")).toEqual({ answer: 42 });+ });++ it("rejects malformed YAML", () => {+ const decodeYaml = Schema.decodeUnknownSync(fromYaml(Schema.Unknown));++ expect(() => decodeYaml("name: ok\n bad-indent: nope\n")).toThrow();+ });+});diff --git a/packages/shared/src/schemaYaml.ts b/packages/shared/src/schemaYaml.tsnew file mode 100644index 000000000..1b0d10fb8--- /dev/null+++ b/packages/shared/src/schemaYaml.ts@@ -0,0 +1,132 @@+import * as Effect from "effect/Effect";+import * as Option from "effect/Option";+import * as Schema from "effect/Schema";+import * as SchemaGetter from "effect/SchemaGetter";+import * as SchemaIssue from "effect/SchemaIssue";+import * as SchemaTransformation from "effect/SchemaTransformation";+import {+ parse as parseYamlString,+ stringify as stringifyYamlValue,+ type CreateNodeOptions,+ type DocumentOptions,+ type ParseOptions,+ type SchemaOptions,+ type ToJSOptions,+ type ToStringOptions,+} from "yaml";++export type YamlParseOptions = ParseOptions & DocumentOptions & SchemaOptions & ToJSOptions;+export type YamlStringifyOptions = DocumentOptions &+ SchemaOptions &+ ParseOptions &+ CreateNodeOptions &+ ToStringOptions;++function formatYamlError(error: unknown): string {+ return error instanceof Error ? error.message : String(error);+}++/**+ * Parses a YAML string into a value.+ *+ * **When to use**+ *+ * Use when you need a schema getter to parse a present encoded YAML string+ * during decoding.+ *+ * **Details**+ *+ * Parse failures become `SchemaIssue.InvalidValue` values.+ *+ * **Example** (Parse YAML)+ *+ * ```ts+ * import { parseYaml } from "@t3tools/shared/schemaYaml"+ *+ * const parse = parseYaml<string>()+ * // Getter<unknown, string>+ * ```+ *+ * @see {@link stringifyYaml} for the inverse operation+ */+export function parseYaml<E extends string>(+ options?: YamlParseOptions,+): SchemaGetter.Getter<unknown, E> {+ return SchemaGetter.transformOrFail((input: E) =>+ Effect.try({+ try: () => parseYamlString(input, options) as unknown,+ catch: (error) =>+ new SchemaIssue.InvalidValue(Option.some(input), { message: formatYamlError(error) }),+ }),+ );+}++/**+ * Stringifies a present value as YAML.+ *+ * **When to use**+ *+ * Use when you need a schema getter to serialize a present decoded value to+ * YAML text during encoding.+ *+ * **Details**+ *+ * Stringify failures become `SchemaIssue.InvalidValue` values.+ *+ * **Example** (Stringify YAML)+ *+ * ```ts+ * import { stringifyYaml } from "@t3tools/shared/schemaYaml"+ *+ * const stringify = stringifyYaml()+ * // Getter<string, unknown>+ * ```+ *+ * @see {@link parseYaml} for the inverse operation+ */+export function stringifyYaml(+ options?: YamlStringifyOptions,+): SchemaGetter.Getter<string, unknown> {+ return SchemaGetter.transformOrFail((input: unknown) =>+ Effect.try({+ try: () => stringifyYamlValue(input, options),+ catch: (error) =>+ new SchemaIssue.InvalidValue(Option.some(input), { message: formatYamlError(error) }),+ }),+ );+}++/**+ * Decodes a YAML string and encodes a value as YAML text.+ *+ * **When to use**+ *+ * Use when you need a schema transformation to decode YAML stored or+ * transmitted as a string before validating the parsed structure.+ *+ * **Details**+ *+ * Decode and encode failures become `InvalidValue` schema issues.+ *+ * **Example** (Parsing YAML)+ *+ * ```ts+ * import * as Schema from "effect/Schema"+ * import { fromYamlString } from "@t3tools/shared/schemaYaml"+ *+ * const schema = Schema.String.pipe(Schema.decodeTo(Schema.Unknown, fromYamlString))+ * ```+ */+export const fromYamlString = new SchemaTransformation.Transformation<unknown, string>(+ parseYaml(),+ stringifyYaml(),+);++/**+ * Build a schema that decodes a YAML string into `A`.+ *+ * Decode parses the input as YAML before validating the parsed value with the+ * provided schema. Encode validates the value and serializes it as YAML text.+ */+export const fromYaml = <S extends Schema.Top>(schema: S) =>+ Schema.String.pipe(Schema.decodeTo(schema, fromYamlString));diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 3c03f40b2..f2078ec83 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -30,9 +30,6 @@ catalogs:vite-plus:specifier: latestversion: 0.1.24- yaml:- specifier: ^2.9.0- version: 2.9.0overrides:'@effect/atom-react': 4.0.0-beta.73@@ -45,6 +42,7 @@ overrides:effect: 4.0.0-beta.73vite: npm:@voidzero-dev/vite-plus-core@latestvitest: npm:@voidzero-dev/vite-plus-test@latest+ yaml: ^2.9.0packageExtensionsChecksum: sha256-MDpMSm2Rk8Y7FDIbaAgFkT45PZBPV7JBzjTAft+noEM=@@ -93,9 +91,6 @@ importers:vitest:specifier: npm:@voidzero-dev/vite-plus-test@latestversion: '@voidzero-dev/[email protected](@types/[email protected])(@voidzero-dev/[email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'- yaml:- specifier: 'catalog:'- version: 2.9.0apps/desktop:dependencies:@@ -670,6 +665,9 @@ importers:effect:specifier: 4.0.0-beta.73version: 4.0.0-beta.73(patch_hash=a28d840fa97ffebabe628e5562837c537d83c40cfdad8049de73c38086f2fb01)+ yaml:+ specifier: ^2.9.0+ version: 2.9.0devDependencies:'@effect/platform-node':specifier: 4.0.0-beta.73@@ -3808,7 +3806,7 @@ packages:typescript: ^5.0.0 || ^6.0.0unplugin-unused: ^0.5.0unrun: '*'- yaml: ^2.4.2+ yaml: ^2.9.0peerDependenciesMeta:'@arethetypeswrong/core':optional: true@@ -8041,11 +8039,6 @@ packages:resolution: {integrity: sha512-qhjK/bzSRZ6HtTvgeFvjNPJGWdZ0+x5NREV/9XZWFjIGezew2b4r5JPy66IfOhd5OA7KeFwk1JfmEbnTvev0cA==}hasBin: true- resolution: {integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==}- engines: {node: '>= 14'}- hasBin: true-resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}engines: {node: '>= 14.6'}@@ -10525,7 +10518,9 @@ snapshots:metro-runtime: 0.84.4transitivePeerDependencies:- '@babel/core'+ - bufferutil- supports-color+ - utf-8-validate'@react-native/[email protected]': {}@@ -16274,9 +16269,7 @@ snapshots:vscode-languageserver-textdocument: 1.0.12vscode-languageserver-types: 3.17.5vscode-uri: 3.1.0- yaml: 2.7.1-- [email protected]: {}+ yaml: 2.9.0diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex 0a6801608..4897eb142 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -45,6 +45,7 @@ overrides:effect: "catalog:"vite: "catalog:"vitest: "catalog:"+ yaml: "catalog:"peerDependencyRules:allowAny:- vitediff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.tsindex b7e6952c1..288881eed 100644--- a/scripts/build-desktop-artifact.ts+++ b/scripts/build-desktop-artifact.ts@@ -1,6 +1,6 @@#!/usr/bin/env node-import { parse as parseYaml } from "yaml";+import { fromYaml } from "@t3tools/shared/schemaYaml";import rootPackageJson from "../package.json" with { type: "json" };import desktopPackageJson from "../apps/desktop/package.json" with { type: "json" };import serverPackageJson from "../apps/server/package.json" with { type: "json" };@@ -29,22 +29,24 @@ const LINUX_ICON_SIZES = [16, 22, 24, 32, 48, 64, 128, 256, 512] as const;const BuildPlatform = Schema.Literals(["mac", "linux", "win"]);const BuildArch = Schema.Literals(["arm64", "x64", "universal"]);-interface WorkspaceConfig {- readonly catalog?: Record<string, string>;- readonly overrides?: Record<string, string>;-}+const WorkspaceConfig = Schema.Struct({+ catalog: Schema.optional(Schema.Record(Schema.String, Schema.String)),+ overrides: Schema.optional(Schema.Record(Schema.String, Schema.String)),+});+type WorkspaceConfig = typeof WorkspaceConfig.Type;const RepoRoot = Effect.service(Path.Path).pipe(Effect.flatMap((path) => path.fromFileUrl(new URL("..", import.meta.url))),);const encodeJsonString = Schema.encodeEffect(Schema.UnknownFromJsonString);+const decodeWorkspaceConfig = Schema.decodeEffect(fromYaml(WorkspaceConfig));const readWorkspaceConfig = Effect.fn("readWorkspaceConfig")(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;const repoRoot = yield* RepoRoot;const workspaceYaml = yield* fs.readFileString(path.join(repoRoot, "pnpm-workspace.yaml"));- return parseYaml(workspaceYaml) as WorkspaceConfig;+ return yield* decodeWorkspaceConfig(workspaceYaml);});interface DesktopBuildIconAssets {@@ -776,7 +778,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (try: () => resolveCatalogDependencies(workspaceOverrides, workspaceCatalog, "apps/desktop"),catch: (cause) =>new BuildScriptError({- message: "Could not resolve overrides from package.json.",+ message: "Could not resolve overrides from pnpm-workspace.yaml.",cause,}),});diff --git a/scripts/lib/reference-repos.ts b/scripts/lib/reference-repos.tsindex f765abe2a..e94034e6e 100644--- a/scripts/lib/reference-repos.ts+++ b/scripts/lib/reference-repos.ts@@ -3,7 +3,7 @@ export interface ReferenceRepo {readonly prefix: string;readonly repository: string;readonly latestRef: string;- readonly packageJsonPath: string;+ readonly versionSourcePath: string;readonly packageVersionPath: ReadonlyArray<string>;readonly versionTagPrefix: string;}@@ -14,8 +14,8 @@ export const referenceRepos: ReadonlyArray<ReferenceRepo> = [prefix: ".repos/effect-smol",repository: "https://github.com/Effect-TS/effect-smol.git",latestRef: "main",- packageJsonPath: "package.json",- packageVersionPath: ["workspaces", "catalog", "effect"],+ versionSourcePath: "pnpm-workspace.yaml",+ packageVersionPath: ["catalog", "effect"],versionTagPrefix: "effect@",},{@@ -23,7 +23,7 @@ export const referenceRepos: ReadonlyArray<ReferenceRepo> = [prefix: ".repos/alchemy-effect",repository: "https://github.com/alchemy-run/alchemy-effect.git",latestRef: "main",- packageJsonPath: "infra/relay/package.json",+ versionSourcePath: "infra/relay/package.json",packageVersionPath: ["dependencies", "alchemy"],versionTagPrefix: "v",},diff --git a/scripts/sync-reference-repos.test.ts b/scripts/sync-reference-repos.test.tsindex bc987cef0..aa415dda5 100644--- a/scripts/sync-reference-repos.test.ts+++ b/scripts/sync-reference-repos.test.ts@@ -63,8 +63,8 @@ it.layer(NodeServices.layer)("sync-reference-repos", (it) => {prefix: "sync-reference-repos-version-",});yield* fs.writeFileString(- path.join(rootDir, "package.json"),- '{"workspaces":{"catalog":{"effect":"4.0.0-beta.73"}}}',+ path.join(rootDir, "pnpm-workspace.yaml"),+ "catalog:\n effect: 4.0.0-beta.73\n",);assert.equal(@@ -110,8 +110,8 @@ it.layer(NodeServices.layer)("sync-reference-repos", (it) => {prefix: "sync-reference-repos-plan-",});yield* fs.writeFileString(- path.join(rootDir, "package.json"),- '{"workspaces":{"catalog":{"effect":"4.0.0-beta.73"}}}',+ path.join(rootDir, "pnpm-workspace.yaml"),+ "catalog:\n effect: 4.0.0-beta.73\n",);const addPlan = yield* planReferenceRepoSync(effectSmol, rootDir, false);@@ -140,8 +140,8 @@ it.layer(NodeServices.layer)("sync-reference-repos", (it) => {prefix: "sync-reference-repos-run-",});yield* fs.writeFileString(- path.join(rootDir, "package.json"),- '{"workspaces":{"catalog":{"effect":"4.0.0-beta.73"}}}',+ path.join(rootDir, "pnpm-workspace.yaml"),+ "catalog:\n effect: 4.0.0-beta.73\n",);yield* syncReferenceRepos({ rootDir, repoId: "effect-smol" }).pipe(diff --git a/scripts/sync-reference-repos.ts b/scripts/sync-reference-repos.tsindex a4fdd9df8..fa267b101 100644--- a/scripts/sync-reference-repos.ts+++ b/scripts/sync-reference-repos.ts@@ -12,6 +12,7 @@ import * as Schema from "effect/Schema";import * as Stream from "effect/Stream";import { Command, Flag } from "effect/unstable/cli";import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";+import { fromYaml } from "@t3tools/shared/schemaYaml";import { referenceRepos, type ReferenceRepo } from "./lib/reference-repos.ts";@@ -36,7 +37,8 @@ export class ReferenceRepoSyncError extends Data.TaggedError("ReferenceRepoSyncEreadonly cause?: unknown;}> {}-const decodePackageJson = Schema.decodeUnknownEffect(Schema.UnknownFromJsonString);+const decodeJsonSource = Schema.decodeUnknownEffect(Schema.UnknownFromJsonString);+const decodeYamlSource = Schema.decodeEffect(fromYaml(Schema.Unknown));const collectStreamAsString = <E>(stream: Stream.Stream<Uint8Array, E>): Effect.Effect<string, E> =>stream.pipe(@@ -58,6 +60,33 @@ function readNestedString(input: unknown, keys: ReadonlyArray<string>): string |return typeof value === "string" && value.length > 0 ? value : undefined;}+function decodeVersionSource(+ sourcePath: string,+ content: string,+): Effect.Effect<unknown, ReferenceRepoSyncError> {+ if (sourcePath.endsWith(".yaml") || sourcePath.endsWith(".yml")) {+ return decodeYamlSource(content).pipe(+ Effect.mapError(+ (cause) =>+ new ReferenceRepoSyncError({+ message: `Unable to parse version source ${sourcePath}.`,+ cause,+ }),+ ),+ );+ }++ return decodeJsonSource(content).pipe(+ Effect.mapError(+ (cause) =>+ new ReferenceRepoSyncError({+ message: `Unable to parse version source ${sourcePath}.`,+ cause,+ }),+ ),+ );+}+function getSelectedRepos(repoId: string | undefined,): Effect.Effect<ReadonlyArray<ReferenceRepo>, ReferenceRepoSyncError> {@@ -88,22 +117,22 @@ export const resolveReferenceRepoRef = Effect.fn("resolveReferenceRepoRef")(funcconst fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const packageJsonPath = path.join(rootDir, repo.packageJsonPath);- const packageJson = yield* fs.readFileString(packageJsonPath).pipe(- Effect.flatMap(decodePackageJson),+ const versionSourcePath = path.join(rootDir, repo.versionSourcePath);+ const versionSourceContent = yield* fs.readFileString(versionSourcePath).pipe(Effect.mapError((cause) =>new ReferenceRepoSyncError({- message: `Unable to read package version for '${repo.id}' from ${packageJsonPath}.`,+ message: `Unable to read package version for '${repo.id}' from ${versionSourcePath}.`,cause,}),),);- const version = readNestedString(packageJson, repo.packageVersionPath);+ const versionSource = yield* decodeVersionSource(repo.versionSourcePath, versionSourceContent);+ const version = readNestedString(versionSource, repo.packageVersionPath);if (!version) {return yield* new ReferenceRepoSyncError({- message: `Unable to resolve package version for '${repo.id}' at ${repo.packageJsonPath}:${repo.packageVersionPath.join(+ message: `Unable to resolve package version for '${repo.id}' at ${repo.versionSourcePath}:${repo.packageVersionPath.join(".",)}.`,});