Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ jobs:
test/util
test/skill
test/index-runtime-namespace.test.ts
test/npm.test.ts
test/permission-agent.test.ts
report_path: packages/opencode/.artifacts/unit/junit-windows-session.xml
# Config and project cover configuration, project discovery, file,
Expand Down
67 changes: 66 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"packages/sdk/js"
],
"catalog": {
"@effect/opentelemetry": "4.0.0-beta.46",
"@effect/platform-node": "4.0.0-beta.46",
"@types/bun": "1.3.11",
"@types/cross-spawn": "6.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/script/e2e-local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ try {
process.env.OPENCODE = "1"
process.env.OPENCODE_PID = String(process.pid)

const log = await import("../../opencode/src/util/log")
const log = await import("../../core/src/util/log")
const install = await import("../../opencode/src/installation")
await log.Log.init({
print: true,
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/context/global-sync.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,14 @@ function createGlobalSync() {
})

if ((event.type as string) === "lsp.server.install.failed") {
const properties = (event as unknown as { properties?: { pkg?: string; error?: string } }).properties
const properties = (
event as unknown as { properties?: { add?: string[]; dir?: string; error?: string } }
).properties
showToast({
variant: "error",
title: language.t("toast.lsp.installFailed.title"),
description: language.t("toast.lsp.installFailed.description", {
pkg: properties?.pkg ?? "",
pkg: properties?.add?.[0] ?? properties?.dir ?? "unknown",
error: properties?.error ?? "",
}),
})
Expand Down
22 changes: 20 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,46 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "1.14.19",
"version": "1.14.28",
"name": "@opencode-ai/core",
"type": "module",
"license": "MIT",
"private": true,
"scripts": {
"test": "bun test",
"test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
"typecheck": "tsgo --noEmit"
},
"exports": {
"./*": "./src/*.ts"
},
"imports": {},
"devDependencies": {
"@tsconfig/bun": "catalog:",
"@types/bun": "catalog:"
"@types/bun": "catalog:",
"@types/cross-spawn": "catalog:",
"@types/npmcli__arborist": "6.3.3",
"@types/semver": "catalog:"
},
"dependencies": {
"@effect/opentelemetry": "catalog:",
Comment thread
Astro-Han marked this conversation as resolved.
"@effect/platform-node": "catalog:",
"@npmcli/arborist": "9.4.0",
"@npmcli/config": "10.8.1",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/context-async-hooks": "2.6.1",
"@opentelemetry/exporter-trace-otlp-http": "0.214.0",
"@opentelemetry/sdk-trace-base": "2.6.1",
"@opentelemetry/sdk-trace-node": "2.6.1",
"effect": "catalog:",
"cross-spawn": "catalog:",
"glob": "13.0.5",
"mime-types": "3.0.2",
"minimatch": "10.2.5",
"semver": "^7.6.3",
"xdg-basedir": "5.1.0",
"zod": "catalog:"
},
"overrides": {
"drizzle-orm": "catalog:"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -502,13 +502,4 @@ export const layer: Layer.Layer<ChildProcessSpawner, never, FileSystem.FileSyste

export const defaultLayer = layer.pipe(Layer.provide(NodeFileSystem.layer), Layer.provide(NodePath.layer))

import { lazy } from "@/util/lazy"

const rt = lazy(async () => {
// Dynamic import to avoid circular dep: cross-spawn-spawner → run-service → Instance → project → cross-spawn-spawner
const { makeRuntime } = await import("@/effect/run-service")
return makeRuntime(ChildProcessSpawner, defaultLayer)
})

type RT = Awaited<ReturnType<typeof rt>>
export const runPromiseExit: RT["runPromiseExit"] = async (...args) => (await rt()).runPromiseExit(...(args as [any]))
export * as CrossSpawnSpawner from "./cross-spawn-spawner"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Cause, Effect, Logger, References } from "effect"
import { Log } from "@/util/log"
import { Log } from "../util/log"

type Fields = Record<string, unknown>

Expand Down
Loading
Loading