mirror of
https://github.com/anomalyco/opencode.git
synced 2026-08-10 03:19:59 -04:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 802534891c | |||
| 3431dfb8b8 | |||
| fefe8b500a | |||
| 5b8573e804 | |||
| 40123cbe2d | |||
| 016c641860 | |||
| b41b0e3d2d | |||
| 3d3e50ebf0 | |||
| 0abc0d541a | |||
| 3f3989e694 | |||
| b4667d9b0d | |||
| 3c68d75776 | |||
| 23ed876835 |
@@ -213,7 +213,7 @@ for (const item of targets) {
|
|||||||
},
|
},
|
||||||
files: embeddedFileMap ? { "opencode-web-ui.gen.ts": embeddedFileMap } : {},
|
files: embeddedFileMap ? { "opencode-web-ui.gen.ts": embeddedFileMap } : {},
|
||||||
entrypoints: [
|
entrypoints: [
|
||||||
"./src/index.ts",
|
"./src/temporary.ts",
|
||||||
parserWorker,
|
parserWorker,
|
||||||
workerPath,
|
workerPath,
|
||||||
rgPath,
|
rgPath,
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
import z from "zod"
|
import z from "zod"
|
||||||
import type { ZodType } from "zod"
|
import type { ZodType } from "zod"
|
||||||
|
|
||||||
export namespace BusEvent {
|
export type Definition = ReturnType<typeof define>
|
||||||
export type Definition = ReturnType<typeof define>
|
|
||||||
|
|
||||||
const registry = new Map<string, Definition>()
|
const registry = new Map<string, Definition>()
|
||||||
|
|
||||||
export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
|
export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
|
||||||
const result = {
|
const result = {
|
||||||
type,
|
type,
|
||||||
properties,
|
properties,
|
||||||
}
|
}
|
||||||
registry.set(type, result)
|
registry.set(type, result)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
export function payloads() {
|
export function payloads() {
|
||||||
return registry
|
return registry
|
||||||
.entries()
|
.entries()
|
||||||
.map(([type, def]) => {
|
.map(([type, def]) => {
|
||||||
@@ -29,5 +28,6 @@ export namespace BusEvent {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
.toArray()
|
.toArray()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export * as BusEvent from "./bus-event"
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import { useEvent } from "@tui/context/event"
|
|||||||
import { SDKProvider, useSDK } from "@tui/context/sdk"
|
import { SDKProvider, useSDK } from "@tui/context/sdk"
|
||||||
import { StartupLoading } from "@tui/component/startup-loading"
|
import { StartupLoading } from "@tui/component/startup-loading"
|
||||||
import { SyncProvider, useSync } from "@tui/context/sync"
|
import { SyncProvider, useSync } from "@tui/context/sync"
|
||||||
import { LocalProvider, useLocal } from "@tui/context/local"
|
import { LocalProvider, parseModel, useLocal } from "@tui/context/local"
|
||||||
import { DialogModel, useConnected } from "@tui/component/dialog-model"
|
import { DialogModel, useConnected } from "@tui/component/dialog-model"
|
||||||
import { DialogMcp } from "@tui/component/dialog-mcp"
|
import { DialogMcp } from "@tui/component/dialog-mcp"
|
||||||
import { DialogStatus } from "@tui/component/dialog-status"
|
import { DialogStatus } from "@tui/component/dialog-status"
|
||||||
@@ -49,10 +49,8 @@ import { DialogAlert } from "./ui/dialog-alert"
|
|||||||
import { DialogConfirm } from "./ui/dialog-confirm"
|
import { DialogConfirm } from "./ui/dialog-confirm"
|
||||||
import { ToastProvider, useToast } from "./ui/toast"
|
import { ToastProvider, useToast } from "./ui/toast"
|
||||||
import { ExitProvider, useExit } from "./context/exit"
|
import { ExitProvider, useExit } from "./context/exit"
|
||||||
import { Session as SessionApi } from "@/session"
|
|
||||||
import { TuiEvent } from "./event"
|
import { TuiEvent } from "./event"
|
||||||
import { KVProvider, useKV } from "./context/kv"
|
import { KVProvider, useKV } from "./context/kv"
|
||||||
import { Provider } from "@/provider"
|
|
||||||
import { ArgsProvider, useArgs, type Args } from "./context/args"
|
import { ArgsProvider, useArgs, type Args } from "./context/args"
|
||||||
import open from "open"
|
import open from "open"
|
||||||
import { PromptRefProvider, usePromptRef } from "./context/prompt"
|
import { PromptRefProvider, usePromptRef } from "./context/prompt"
|
||||||
@@ -304,7 +302,7 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
|
|||||||
|
|
||||||
if (route.data.type === "session") {
|
if (route.data.type === "session") {
|
||||||
const session = sync.session.get(route.data.sessionID)
|
const session = sync.session.get(route.data.sessionID)
|
||||||
if (!session || SessionApi.isDefaultTitle(session.title)) {
|
if (!session) {
|
||||||
renderer.setTerminalTitle("OpenCode")
|
renderer.setTerminalTitle("OpenCode")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -324,7 +322,7 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
|
|||||||
batch(() => {
|
batch(() => {
|
||||||
if (args.agent) local.agent.set(args.agent)
|
if (args.agent) local.agent.set(args.agent)
|
||||||
if (args.model) {
|
if (args.model) {
|
||||||
const { providerID, modelID } = Provider.parseModel(args.model)
|
const { providerID, modelID } = parseModel(args.model)
|
||||||
if (!providerID || !modelID)
|
if (!providerID || !modelID)
|
||||||
return toast.show({
|
return toast.show({
|
||||||
variant: "warning",
|
variant: "warning",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const { use: useKV, provider: KVProvider } = createSimpleContext({
|
|||||||
const [store, setStore] = createStore<Record<string, any>>()
|
const [store, setStore] = createStore<Record<string, any>>()
|
||||||
const filePath = path.join(Global.Path.state, "kv.json")
|
const filePath = path.join(Global.Path.state, "kv.json")
|
||||||
|
|
||||||
Filesystem.readJson(filePath)
|
Filesystem.readJson<Record<string, any>>(filePath)
|
||||||
.then((x) => {
|
.then((x) => {
|
||||||
setStore(x)
|
setStore(x)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { BusEvent } from "@/bus/bus-event"
|
import { BusEvent } from "@/bus/bus-event"
|
||||||
import { SessionID } from "@/session/schema"
|
|
||||||
import z from "zod"
|
import z from "zod"
|
||||||
|
|
||||||
export const TuiEvent = {
|
export const TuiEvent = {
|
||||||
@@ -42,7 +41,7 @@ export const TuiEvent = {
|
|||||||
SessionSelect: BusEvent.define(
|
SessionSelect: BusEvent.define(
|
||||||
"tui.session.select",
|
"tui.session.select",
|
||||||
z.object({
|
z.object({
|
||||||
sessionID: SessionID.zod.describe("Session ID to navigate to"),
|
sessionID: z.string().describe("Session ID to navigate to"),
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ function View(props: { api: TuiPluginApi }) {
|
|||||||
const [open, setOpen] = createSignal(true)
|
const [open, setOpen] = createSignal(true)
|
||||||
const theme = () => props.api.theme.current
|
const theme = () => props.api.theme.current
|
||||||
const list = createMemo(() => props.api.state.lsp())
|
const list = createMemo(() => props.api.state.lsp())
|
||||||
const off = createMemo(() => props.api.state.config.lsp === false)
|
const off = createMemo(() => props.api.state.config.lsp)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<box>
|
<box>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import { TuiConfig } from "@/cli/cmd/tui/config/tui"
|
|||||||
import { Log } from "@/util"
|
import { Log } from "@/util"
|
||||||
import { errorData, errorMessage } from "@/util/error"
|
import { errorData, errorMessage } from "@/util/error"
|
||||||
import { isRecord } from "@/util/record"
|
import { isRecord } from "@/util/record"
|
||||||
import { Instance } from "@/project/instance"
|
|
||||||
import {
|
import {
|
||||||
readPackageThemes,
|
readPackageThemes,
|
||||||
readPluginId,
|
readPluginId,
|
||||||
@@ -790,10 +789,7 @@ async function addPluginBySpec(state: RuntimeState | undefined, raw: string) {
|
|||||||
state.pending.delete(spec)
|
state.pending.delete(spec)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
const ready = await Instance.provide({
|
const ready = await resolveExternalPlugins([cfg], () => TuiConfig.waitForDependencies()).catch((error) => {
|
||||||
directory: state.directory,
|
|
||||||
fn: () => resolveExternalPlugins([cfg], () => TuiConfig.waitForDependencies()),
|
|
||||||
}).catch((error) => {
|
|
||||||
fail("failed to add tui plugin", { path: next, error })
|
fail("failed to add tui plugin", { path: next, error })
|
||||||
return [] as PluginLoad[]
|
return [] as PluginLoad[]
|
||||||
})
|
})
|
||||||
@@ -987,9 +983,6 @@ export namespace TuiPluginRuntime {
|
|||||||
}
|
}
|
||||||
runtime = next
|
runtime = next
|
||||||
try {
|
try {
|
||||||
await Instance.provide({
|
|
||||||
directory: cwd,
|
|
||||||
fn: async () => {
|
|
||||||
const records = Flag.OPENCODE_PURE ? [] : (config.plugin_origins ?? [])
|
const records = Flag.OPENCODE_PURE ? [] : (config.plugin_origins ?? [])
|
||||||
if (Flag.OPENCODE_PURE && config.plugin_origins?.length) {
|
if (Flag.OPENCODE_PURE && config.plugin_origins?.length) {
|
||||||
log.info("skipping external tui plugins in pure mode", { count: config.plugin_origins.length })
|
log.info("skipping external tui plugins in pure mode", { count: config.plugin_origins.length })
|
||||||
@@ -1021,8 +1014,6 @@ export namespace TuiPluginRuntime {
|
|||||||
// and hook chains rely on stable plugin ordering.
|
// and hook chains rely on stable plugin ordering.
|
||||||
await activatePluginEntry(next, plugin, false)
|
await activatePluginEntry(next, plugin, false)
|
||||||
}
|
}
|
||||||
},
|
|
||||||
})
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
fail("failed to load tui plugins", { directory: cwd, error })
|
fail("failed to load tui plugins", { directory: cwd, error })
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,10 +28,10 @@ export function FormatError(input: unknown) {
|
|||||||
// ProviderModelNotFoundError: { providerID: string, modelID: string, suggestions?: string[] }
|
// ProviderModelNotFoundError: { providerID: string, modelID: string, suggestions?: string[] }
|
||||||
if (NamedError.hasName(input, "ProviderModelNotFoundError")) {
|
if (NamedError.hasName(input, "ProviderModelNotFoundError")) {
|
||||||
const data = (input as ErrorLike).data
|
const data = (input as ErrorLike).data
|
||||||
const suggestions = data?.suggestions as string[] | undefined
|
const suggestions: string[] = Array.isArray(data?.suggestions) ? data.suggestions : []
|
||||||
return [
|
return [
|
||||||
`Model not found: ${data?.providerID}/${data?.modelID}`,
|
`Model not found: ${data?.providerID}/${data?.modelID}`,
|
||||||
...(Array.isArray(suggestions) && suggestions.length ? ["Did you mean: " + suggestions.join(", ")] : []),
|
...(suggestions.length ? ["Did you mean: " + suggestions.join(", ")] : []),
|
||||||
`Try: \`opencode models\` to list available models`,
|
`Try: \`opencode models\` to list available models`,
|
||||||
`Or check your config (opencode.json) provider/model names`,
|
`Or check your config (opencode.json) provider/model names`,
|
||||||
].join("\n")
|
].join("\n")
|
||||||
@@ -64,10 +64,10 @@ export function FormatError(input: unknown) {
|
|||||||
const data = (input as ErrorLike).data
|
const data = (input as ErrorLike).data
|
||||||
const path = data?.path
|
const path = data?.path
|
||||||
const message = data?.message
|
const message = data?.message
|
||||||
const issues = data?.issues as Array<{ message: string; path: string[] }> | undefined
|
const issues: Array<{ message: string; path: string[] }> = Array.isArray(data?.issues) ? data.issues : []
|
||||||
return [
|
return [
|
||||||
`Configuration is invalid${path && path !== "config" ? ` at ${path}` : ""}` + (message ? `: ${message}` : ""),
|
`Configuration is invalid${path && path !== "config" ? ` at ${path}` : ""}` + (message ? `: ${message}` : ""),
|
||||||
...(issues?.map((issue) => "↳ " + issue.message + " " + issue.path.join(".")) ?? []),
|
...issues.map((issue) => "↳ " + issue.message + " " + issue.path.join(".")),
|
||||||
].join("\n")
|
].join("\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ export const Info = z
|
|||||||
.optional(),
|
.optional(),
|
||||||
lsp: z
|
lsp: z
|
||||||
.union([
|
.union([
|
||||||
z.literal(false),
|
z.literal(true),
|
||||||
z.record(
|
z.record(
|
||||||
z.string(),
|
z.string(),
|
||||||
z.union([
|
z.union([
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import os from "os"
|
|||||||
import { Filesystem } from "@/util"
|
import { Filesystem } from "@/util"
|
||||||
import { InvalidError } from "./error"
|
import { InvalidError } from "./error"
|
||||||
|
|
||||||
type ParseSource =
|
export type ParseSource =
|
||||||
| {
|
| {
|
||||||
type: "path"
|
type: "path"
|
||||||
path: string
|
path: string
|
||||||
|
|||||||
@@ -8,10 +8,9 @@ import { ripgrep } from "ripgrep"
|
|||||||
import { Filesystem } from "@/util"
|
import { Filesystem } from "@/util"
|
||||||
import { Log } from "@/util"
|
import { Log } from "@/util"
|
||||||
|
|
||||||
export namespace Ripgrep {
|
const log = Log.create({ service: "ripgrep" })
|
||||||
const log = Log.create({ service: "ripgrep" })
|
|
||||||
|
|
||||||
const Stats = z.object({
|
const Stats = z.object({
|
||||||
elapsed: z.object({
|
elapsed: z.object({
|
||||||
secs: z.number(),
|
secs: z.number(),
|
||||||
nanos: z.number(),
|
nanos: z.number(),
|
||||||
@@ -23,18 +22,18 @@ export namespace Ripgrep {
|
|||||||
bytes_printed: z.number(),
|
bytes_printed: z.number(),
|
||||||
matched_lines: z.number(),
|
matched_lines: z.number(),
|
||||||
matches: z.number(),
|
matches: z.number(),
|
||||||
})
|
})
|
||||||
|
|
||||||
const Begin = z.object({
|
const Begin = z.object({
|
||||||
type: z.literal("begin"),
|
type: z.literal("begin"),
|
||||||
data: z.object({
|
data: z.object({
|
||||||
path: z.object({
|
path: z.object({
|
||||||
text: z.string(),
|
text: z.string(),
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
export const Match = z.object({
|
export const Match = z.object({
|
||||||
type: z.literal("match"),
|
type: z.literal("match"),
|
||||||
data: z.object({
|
data: z.object({
|
||||||
path: z.object({
|
path: z.object({
|
||||||
@@ -55,9 +54,9 @@ export namespace Ripgrep {
|
|||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
const End = z.object({
|
const End = z.object({
|
||||||
type: z.literal("end"),
|
type: z.literal("end"),
|
||||||
data: z.object({
|
data: z.object({
|
||||||
path: z.object({
|
path: z.object({
|
||||||
@@ -66,9 +65,9 @@ export namespace Ripgrep {
|
|||||||
binary_offset: z.number().nullable(),
|
binary_offset: z.number().nullable(),
|
||||||
stats: Stats,
|
stats: Stats,
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
const Summary = z.object({
|
const Summary = z.object({
|
||||||
type: z.literal("summary"),
|
type: z.literal("summary"),
|
||||||
data: z.object({
|
data: z.object({
|
||||||
elapsed_total: z.object({
|
elapsed_total: z.object({
|
||||||
@@ -78,33 +77,33 @@ export namespace Ripgrep {
|
|||||||
}),
|
}),
|
||||||
stats: Stats,
|
stats: Stats,
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
const Result = z.union([Begin, Match, End, Summary])
|
const Result = z.union([Begin, Match, End, Summary])
|
||||||
|
|
||||||
export type Result = z.infer<typeof Result>
|
export type Result = z.infer<typeof Result>
|
||||||
export type Match = z.infer<typeof Match>
|
export type Match = z.infer<typeof Match>
|
||||||
export type Item = Match["data"]
|
export type Item = Match["data"]
|
||||||
export type Begin = z.infer<typeof Begin>
|
export type Begin = z.infer<typeof Begin>
|
||||||
export type End = z.infer<typeof End>
|
export type End = z.infer<typeof End>
|
||||||
export type Summary = z.infer<typeof Summary>
|
export type Summary = z.infer<typeof Summary>
|
||||||
export type Row = Match["data"]
|
export type Row = Match["data"]
|
||||||
|
|
||||||
export interface SearchResult {
|
export interface SearchResult {
|
||||||
items: Item[]
|
items: Item[]
|
||||||
partial: boolean
|
partial: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface FilesInput {
|
export interface FilesInput {
|
||||||
cwd: string
|
cwd: string
|
||||||
glob?: string[]
|
glob?: string[]
|
||||||
hidden?: boolean
|
hidden?: boolean
|
||||||
follow?: boolean
|
follow?: boolean
|
||||||
maxDepth?: number
|
maxDepth?: number
|
||||||
signal?: AbortSignal
|
signal?: AbortSignal
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SearchInput {
|
export interface SearchInput {
|
||||||
cwd: string
|
cwd: string
|
||||||
pattern: string
|
pattern: string
|
||||||
glob?: string[]
|
glob?: string[]
|
||||||
@@ -112,91 +111,91 @@ export namespace Ripgrep {
|
|||||||
follow?: boolean
|
follow?: boolean
|
||||||
file?: string[]
|
file?: string[]
|
||||||
signal?: AbortSignal
|
signal?: AbortSignal
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface TreeInput {
|
export interface TreeInput {
|
||||||
cwd: string
|
cwd: string
|
||||||
limit?: number
|
limit?: number
|
||||||
signal?: AbortSignal
|
signal?: AbortSignal
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Interface {
|
export interface Interface {
|
||||||
readonly files: (input: FilesInput) => Stream.Stream<string, Error>
|
readonly files: (input: FilesInput) => Stream.Stream<string, Error>
|
||||||
readonly tree: (input: TreeInput) => Effect.Effect<string, Error>
|
readonly tree: (input: TreeInput) => Effect.Effect<string, Error>
|
||||||
readonly search: (input: SearchInput) => Effect.Effect<SearchResult, Error>
|
readonly search: (input: SearchInput) => Effect.Effect<SearchResult, Error>
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Service extends Context.Service<Service, Interface>()("@opencode/Ripgrep") {}
|
export class Service extends Context.Service<Service, Interface>()("@opencode/Ripgrep") {}
|
||||||
|
|
||||||
type Run = { kind: "files" | "search"; cwd: string; args: string[] }
|
type Run = { kind: "files" | "search"; cwd: string; args: string[] }
|
||||||
|
|
||||||
type WorkerResult = {
|
type WorkerResult = {
|
||||||
type: "result"
|
type: "result"
|
||||||
code: number
|
code: number
|
||||||
stdout: string
|
stdout: string
|
||||||
stderr: string
|
stderr: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type WorkerLine = {
|
type WorkerLine = {
|
||||||
type: "line"
|
type: "line"
|
||||||
line: string
|
line: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type WorkerDone = {
|
type WorkerDone = {
|
||||||
type: "done"
|
type: "done"
|
||||||
code: number
|
code: number
|
||||||
stderr: string
|
stderr: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type WorkerError = {
|
type WorkerError = {
|
||||||
type: "error"
|
type: "error"
|
||||||
error: {
|
error: {
|
||||||
message: string
|
message: string
|
||||||
name?: string
|
name?: string
|
||||||
stack?: string
|
stack?: string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function env() {
|
function env() {
|
||||||
const env = Object.fromEntries(
|
const env = Object.fromEntries(
|
||||||
Object.entries(process.env).filter((item): item is [string, string] => item[1] !== undefined),
|
Object.entries(process.env).filter((item): item is [string, string] => item[1] !== undefined),
|
||||||
)
|
)
|
||||||
delete env.RIPGREP_CONFIG_PATH
|
delete env.RIPGREP_CONFIG_PATH
|
||||||
return env
|
return env
|
||||||
}
|
}
|
||||||
|
|
||||||
function text(input: unknown) {
|
function text(input: unknown) {
|
||||||
if (typeof input === "string") return input
|
if (typeof input === "string") return input
|
||||||
if (input instanceof ArrayBuffer) return Buffer.from(input).toString()
|
if (input instanceof ArrayBuffer) return Buffer.from(input).toString()
|
||||||
if (ArrayBuffer.isView(input)) return Buffer.from(input.buffer, input.byteOffset, input.byteLength).toString()
|
if (ArrayBuffer.isView(input)) return Buffer.from(input.buffer, input.byteOffset, input.byteLength).toString()
|
||||||
return String(input)
|
return String(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
function toError(input: unknown) {
|
function toError(input: unknown) {
|
||||||
if (input instanceof Error) return input
|
if (input instanceof Error) return input
|
||||||
if (typeof input === "string") return new Error(input)
|
if (typeof input === "string") return new Error(input)
|
||||||
return new Error(String(input))
|
return new Error(String(input))
|
||||||
}
|
}
|
||||||
|
|
||||||
function abort(signal?: AbortSignal) {
|
function abort(signal?: AbortSignal) {
|
||||||
const err = signal?.reason
|
const err = signal?.reason
|
||||||
if (err instanceof Error) return err
|
if (err instanceof Error) return err
|
||||||
const out = new Error("Aborted")
|
const out = new Error("Aborted")
|
||||||
out.name = "AbortError"
|
out.name = "AbortError"
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
function error(stderr: string, code: number) {
|
function error(stderr: string, code: number) {
|
||||||
const err = new Error(stderr.trim() || `ripgrep failed with code ${code}`)
|
const err = new Error(stderr.trim() || `ripgrep failed with code ${code}`)
|
||||||
err.name = "RipgrepError"
|
err.name = "RipgrepError"
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
function clean(file: string) {
|
function clean(file: string) {
|
||||||
return path.normalize(file.replace(/^\.[\\/]/, ""))
|
return path.normalize(file.replace(/^\.[\\/]/, ""))
|
||||||
}
|
}
|
||||||
|
|
||||||
function row(data: Row): Row {
|
function row(data: Row): Row {
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
path: {
|
path: {
|
||||||
@@ -204,16 +203,16 @@ export namespace Ripgrep {
|
|||||||
text: clean(data.path.text),
|
text: clean(data.path.text),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function opts(cwd: string) {
|
function opts(cwd: string) {
|
||||||
return {
|
return {
|
||||||
env: env(),
|
env: env(),
|
||||||
preopens: { ".": cwd },
|
preopens: { ".": cwd },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function check(cwd: string) {
|
function check(cwd: string) {
|
||||||
return Effect.tryPromise({
|
return Effect.tryPromise({
|
||||||
try: () => fs.stat(cwd).catch(() => undefined),
|
try: () => fs.stat(cwd).catch(() => undefined),
|
||||||
catch: toError,
|
catch: toError,
|
||||||
@@ -230,9 +229,9 @@ export namespace Ripgrep {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function filesArgs(input: FilesInput) {
|
function filesArgs(input: FilesInput) {
|
||||||
const args = ["--files", "--glob=!.git/*"]
|
const args = ["--files", "--glob=!.git/*"]
|
||||||
if (input.follow) args.push("--follow")
|
if (input.follow) args.push("--follow")
|
||||||
if (input.hidden !== false) args.push("--hidden")
|
if (input.hidden !== false) args.push("--hidden")
|
||||||
@@ -244,9 +243,9 @@ export namespace Ripgrep {
|
|||||||
}
|
}
|
||||||
args.push(".")
|
args.push(".")
|
||||||
return args
|
return args
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchArgs(input: SearchInput) {
|
function searchArgs(input: SearchInput) {
|
||||||
const args = ["--json", "--hidden", "--glob=!.git/*", "--no-messages"]
|
const args = ["--json", "--hidden", "--glob=!.git/*", "--no-messages"]
|
||||||
if (input.follow) args.push("--follow")
|
if (input.follow) args.push("--follow")
|
||||||
if (input.glob) {
|
if (input.glob) {
|
||||||
@@ -257,20 +256,20 @@ export namespace Ripgrep {
|
|||||||
if (input.limit) args.push(`--max-count=${input.limit}`)
|
if (input.limit) args.push(`--max-count=${input.limit}`)
|
||||||
args.push("--", input.pattern, ...(input.file ?? ["."]))
|
args.push("--", input.pattern, ...(input.file ?? ["."]))
|
||||||
return args
|
return args
|
||||||
}
|
}
|
||||||
|
|
||||||
function parse(stdout: string) {
|
function parse(stdout: string) {
|
||||||
return stdout
|
return stdout
|
||||||
.trim()
|
.trim()
|
||||||
.split(/\r?\n/)
|
.split(/\r?\n/)
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.map((line) => Result.parse(JSON.parse(line)))
|
.map((line) => Result.parse(JSON.parse(line)))
|
||||||
.flatMap((item) => (item.type === "match" ? [row(item.data)] : []))
|
.flatMap((item) => (item.type === "match" ? [row(item.data)] : []))
|
||||||
}
|
}
|
||||||
|
|
||||||
declare const OPENCODE_RIPGREP_WORKER_PATH: string
|
declare const OPENCODE_RIPGREP_WORKER_PATH: string
|
||||||
|
|
||||||
function target(): Effect.Effect<string | URL, Error> {
|
function target(): Effect.Effect<string | URL, Error> {
|
||||||
if (typeof OPENCODE_RIPGREP_WORKER_PATH !== "undefined") {
|
if (typeof OPENCODE_RIPGREP_WORKER_PATH !== "undefined") {
|
||||||
return Effect.succeed(OPENCODE_RIPGREP_WORKER_PATH)
|
return Effect.succeed(OPENCODE_RIPGREP_WORKER_PATH)
|
||||||
}
|
}
|
||||||
@@ -279,26 +278,26 @@ export namespace Ripgrep {
|
|||||||
try: () => Filesystem.exists(fileURLToPath(js)),
|
try: () => Filesystem.exists(fileURLToPath(js)),
|
||||||
catch: toError,
|
catch: toError,
|
||||||
}).pipe(Effect.map((exists) => (exists ? js : new URL("./ripgrep.worker.ts", import.meta.url))))
|
}).pipe(Effect.map((exists) => (exists ? js : new URL("./ripgrep.worker.ts", import.meta.url))))
|
||||||
}
|
}
|
||||||
|
|
||||||
function worker() {
|
function worker() {
|
||||||
return target().pipe(Effect.flatMap((file) => Effect.sync(() => new Worker(file, { env: env() }))))
|
return target().pipe(Effect.flatMap((file) => Effect.sync(() => new Worker(file, { env: env() }))))
|
||||||
}
|
}
|
||||||
|
|
||||||
function drain(buf: string, chunk: unknown, push: (line: string) => void) {
|
function drain(buf: string, chunk: unknown, push: (line: string) => void) {
|
||||||
const lines = (buf + text(chunk)).split(/\r?\n/)
|
const lines = (buf + text(chunk)).split(/\r?\n/)
|
||||||
buf = lines.pop() || ""
|
buf = lines.pop() || ""
|
||||||
for (const line of lines) {
|
for (const line of lines) {
|
||||||
if (line) push(line)
|
if (line) push(line)
|
||||||
}
|
}
|
||||||
return buf
|
return buf
|
||||||
}
|
}
|
||||||
|
|
||||||
function fail(queue: Queue.Queue<string, Error | Cause.Done>, err: Error) {
|
function fail(queue: Queue.Queue<string, Error | Cause.Done>, err: Error) {
|
||||||
Queue.failCauseUnsafe(queue, Cause.fail(err))
|
Queue.failCauseUnsafe(queue, Cause.fail(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchDirect(input: SearchInput) {
|
function searchDirect(input: SearchInput) {
|
||||||
return Effect.tryPromise({
|
return Effect.tryPromise({
|
||||||
try: () =>
|
try: () =>
|
||||||
ripgrep(searchArgs(input), {
|
ripgrep(searchArgs(input), {
|
||||||
@@ -318,9 +317,9 @@ export namespace Ripgrep {
|
|||||||
}))
|
}))
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchWorker(input: SearchInput) {
|
function searchWorker(input: SearchInput) {
|
||||||
if (input.signal?.aborted) return Effect.fail(abort(input.signal))
|
if (input.signal?.aborted) return Effect.fail(abort(input.signal))
|
||||||
|
|
||||||
return Effect.acquireUseRelease(
|
return Effect.acquireUseRelease(
|
||||||
@@ -377,9 +376,9 @@ export namespace Ripgrep {
|
|||||||
}),
|
}),
|
||||||
(w) => Effect.sync(() => w.terminate()),
|
(w) => Effect.sync(() => w.terminate()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function filesDirect(input: FilesInput) {
|
function filesDirect(input: FilesInput) {
|
||||||
return Stream.callback<string, Error>(
|
return Stream.callback<string, Error>(
|
||||||
Effect.fnUntraced(function* (queue: Queue.Queue<string, Error | Cause.Done>) {
|
Effect.fnUntraced(function* (queue: Queue.Queue<string, Error | Cause.Done>) {
|
||||||
let buf = ""
|
let buf = ""
|
||||||
@@ -427,9 +426,9 @@ export namespace Ripgrep {
|
|||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function filesWorker(input: FilesInput) {
|
function filesWorker(input: FilesInput) {
|
||||||
return Stream.callback<string, Error>(
|
return Stream.callback<string, Error>(
|
||||||
Effect.fnUntraced(function* (queue: Queue.Queue<string, Error | Cause.Done>) {
|
Effect.fnUntraced(function* (queue: Queue.Queue<string, Error | Cause.Done>) {
|
||||||
if (input.signal?.aborted) {
|
if (input.signal?.aborted) {
|
||||||
@@ -489,9 +488,9 @@ export namespace Ripgrep {
|
|||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const layer = Layer.effect(
|
export const layer = Layer.effect(
|
||||||
Service,
|
Service,
|
||||||
Effect.gen(function* () {
|
Effect.gen(function* () {
|
||||||
const source = (input: FilesInput) => {
|
const source = (input: FilesInput) => {
|
||||||
@@ -569,7 +568,8 @@ export namespace Ripgrep {
|
|||||||
|
|
||||||
return Service.of({ files, tree, search })
|
return Service.of({ files, tree, search })
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
export const defaultLayer = layer
|
export const defaultLayer = layer
|
||||||
}
|
|
||||||
|
export * as Ripgrep from "./ripgrep"
|
||||||
|
|||||||
@@ -5,39 +5,38 @@ import { Flag } from "@/flag/flag"
|
|||||||
import type { SessionID } from "@/session/schema"
|
import type { SessionID } from "@/session/schema"
|
||||||
import { Log } from "../util"
|
import { Log } from "../util"
|
||||||
|
|
||||||
export namespace FileTime {
|
const log = Log.create({ service: "file.time" })
|
||||||
const log = Log.create({ service: "file.time" })
|
|
||||||
|
|
||||||
export type Stamp = {
|
export type Stamp = {
|
||||||
readonly read: Date
|
readonly read: Date
|
||||||
readonly mtime: number | undefined
|
readonly mtime: number | undefined
|
||||||
readonly size: number | undefined
|
readonly size: number | undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = (reads: Map<SessionID, Map<string, Stamp>>, sessionID: SessionID) => {
|
const session = (reads: Map<SessionID, Map<string, Stamp>>, sessionID: SessionID) => {
|
||||||
const value = reads.get(sessionID)
|
const value = reads.get(sessionID)
|
||||||
if (value) return value
|
if (value) return value
|
||||||
|
|
||||||
const next = new Map<string, Stamp>()
|
const next = new Map<string, Stamp>()
|
||||||
reads.set(sessionID, next)
|
reads.set(sessionID, next)
|
||||||
return next
|
return next
|
||||||
}
|
}
|
||||||
|
|
||||||
interface State {
|
interface State {
|
||||||
reads: Map<SessionID, Map<string, Stamp>>
|
reads: Map<SessionID, Map<string, Stamp>>
|
||||||
locks: Map<string, Semaphore.Semaphore>
|
locks: Map<string, Semaphore.Semaphore>
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Interface {
|
export interface Interface {
|
||||||
readonly read: (sessionID: SessionID, file: string) => Effect.Effect<void>
|
readonly read: (sessionID: SessionID, file: string) => Effect.Effect<void>
|
||||||
readonly get: (sessionID: SessionID, file: string) => Effect.Effect<Date | undefined>
|
readonly get: (sessionID: SessionID, file: string) => Effect.Effect<Date | undefined>
|
||||||
readonly assert: (sessionID: SessionID, filepath: string) => Effect.Effect<void>
|
readonly assert: (sessionID: SessionID, filepath: string) => Effect.Effect<void>
|
||||||
readonly withLock: <T>(filepath: string, fn: () => Effect.Effect<T>) => Effect.Effect<T>
|
readonly withLock: <T>(filepath: string, fn: () => Effect.Effect<T>) => Effect.Effect<T>
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Service extends Context.Service<Service, Interface>()("@opencode/FileTime") {}
|
export class Service extends Context.Service<Service, Interface>()("@opencode/FileTime") {}
|
||||||
|
|
||||||
export const layer = Layer.effect(
|
export const layer = Layer.effect(
|
||||||
Service,
|
Service,
|
||||||
Effect.gen(function* () {
|
Effect.gen(function* () {
|
||||||
const fsys = yield* AppFileSystem.Service
|
const fsys = yield* AppFileSystem.Service
|
||||||
@@ -107,7 +106,8 @@ export namespace FileTime {
|
|||||||
|
|
||||||
return Service.of({ read, get, assert, withLock })
|
return Service.of({ read, get, assert, withLock })
|
||||||
}),
|
}),
|
||||||
).pipe(Layer.orDie)
|
).pipe(Layer.orDie)
|
||||||
|
|
||||||
export const defaultLayer = layer.pipe(Layer.provide(AppFileSystem.defaultLayer))
|
export const defaultLayer = layer.pipe(Layer.provide(AppFileSystem.defaultLayer))
|
||||||
}
|
|
||||||
|
export * as FileTime from "./time"
|
||||||
|
|||||||
@@ -19,11 +19,10 @@ import { Log } from "../util"
|
|||||||
|
|
||||||
declare const OPENCODE_LIBC: string | undefined
|
declare const OPENCODE_LIBC: string | undefined
|
||||||
|
|
||||||
export namespace FileWatcher {
|
const log = Log.create({ service: "file.watcher" })
|
||||||
const log = Log.create({ service: "file.watcher" })
|
const SUBSCRIBE_TIMEOUT_MS = 10_000
|
||||||
const SUBSCRIBE_TIMEOUT_MS = 10_000
|
|
||||||
|
|
||||||
export const Event = {
|
export const Event = {
|
||||||
Updated: BusEvent.define(
|
Updated: BusEvent.define(
|
||||||
"file.watcher.updated",
|
"file.watcher.updated",
|
||||||
z.object({
|
z.object({
|
||||||
@@ -31,9 +30,9 @@ export namespace FileWatcher {
|
|||||||
event: z.union([z.literal("add"), z.literal("change"), z.literal("unlink")]),
|
event: z.union([z.literal("add"), z.literal("change"), z.literal("unlink")]),
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
const watcher = lazy((): typeof import("@parcel/watcher") | undefined => {
|
const watcher = lazy((): typeof import("@parcel/watcher") | undefined => {
|
||||||
try {
|
try {
|
||||||
const binding = require(
|
const binding = require(
|
||||||
`@parcel/watcher-${process.platform}-${process.arch}${process.platform === "linux" ? `-${OPENCODE_LIBC || "glibc"}` : ""}`,
|
`@parcel/watcher-${process.platform}-${process.arch}${process.platform === "linux" ? `-${OPENCODE_LIBC || "glibc"}` : ""}`,
|
||||||
@@ -43,30 +42,30 @@ export namespace FileWatcher {
|
|||||||
log.error("failed to load watcher binding", { error })
|
log.error("failed to load watcher binding", { error })
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
function getBackend() {
|
function getBackend() {
|
||||||
if (process.platform === "win32") return "windows"
|
if (process.platform === "win32") return "windows"
|
||||||
if (process.platform === "darwin") return "fs-events"
|
if (process.platform === "darwin") return "fs-events"
|
||||||
if (process.platform === "linux") return "inotify"
|
if (process.platform === "linux") return "inotify"
|
||||||
}
|
}
|
||||||
|
|
||||||
function protecteds(dir: string) {
|
function protecteds(dir: string) {
|
||||||
return Protected.paths().filter((item) => {
|
return Protected.paths().filter((item) => {
|
||||||
const rel = path.relative(dir, item)
|
const rel = path.relative(dir, item)
|
||||||
return rel !== "" && !rel.startsWith("..") && !path.isAbsolute(rel)
|
return rel !== "" && !rel.startsWith("..") && !path.isAbsolute(rel)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export const hasNativeBinding = () => !!watcher()
|
export const hasNativeBinding = () => !!watcher()
|
||||||
|
|
||||||
export interface Interface {
|
export interface Interface {
|
||||||
readonly init: () => Effect.Effect<void>
|
readonly init: () => Effect.Effect<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Service extends Context.Service<Service, Interface>()("@opencode/FileWatcher") {}
|
export class Service extends Context.Service<Service, Interface>()("@opencode/FileWatcher") {}
|
||||||
|
|
||||||
export const layer = Layer.effect(
|
export const layer = Layer.effect(
|
||||||
Service,
|
Service,
|
||||||
Effect.gen(function* () {
|
Effect.gen(function* () {
|
||||||
const config = yield* Config.Service
|
const config = yield* Config.Service
|
||||||
@@ -157,7 +156,8 @@ export namespace FileWatcher {
|
|||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(Git.defaultLayer))
|
export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(Git.defaultLayer))
|
||||||
}
|
|
||||||
|
export * as FileWatcher from "./watcher"
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import z from "zod"
|
import z from "zod"
|
||||||
import { randomBytes } from "crypto"
|
import { randomBytes } from "crypto"
|
||||||
|
|
||||||
export namespace Identifier {
|
const prefixes = {
|
||||||
const prefixes = {
|
|
||||||
event: "evt",
|
event: "evt",
|
||||||
session: "ses",
|
session: "ses",
|
||||||
message: "msg",
|
message: "msg",
|
||||||
@@ -14,27 +13,27 @@ export namespace Identifier {
|
|||||||
tool: "tool",
|
tool: "tool",
|
||||||
workspace: "wrk",
|
workspace: "wrk",
|
||||||
entry: "ent",
|
entry: "ent",
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
export function schema(prefix: keyof typeof prefixes) {
|
export function schema(prefix: keyof typeof prefixes) {
|
||||||
return z.string().startsWith(prefixes[prefix])
|
return z.string().startsWith(prefixes[prefix])
|
||||||
}
|
}
|
||||||
|
|
||||||
const LENGTH = 26
|
const LENGTH = 26
|
||||||
|
|
||||||
// State for monotonic ID generation
|
// State for monotonic ID generation
|
||||||
let lastTimestamp = 0
|
let lastTimestamp = 0
|
||||||
let counter = 0
|
let counter = 0
|
||||||
|
|
||||||
export function ascending(prefix: keyof typeof prefixes, given?: string) {
|
export function ascending(prefix: keyof typeof prefixes, given?: string) {
|
||||||
return generateID(prefix, "ascending", given)
|
return generateID(prefix, "ascending", given)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function descending(prefix: keyof typeof prefixes, given?: string) {
|
export function descending(prefix: keyof typeof prefixes, given?: string) {
|
||||||
return generateID(prefix, "descending", given)
|
return generateID(prefix, "descending", given)
|
||||||
}
|
}
|
||||||
|
|
||||||
function generateID(prefix: keyof typeof prefixes, direction: "descending" | "ascending", given?: string): string {
|
function generateID(prefix: keyof typeof prefixes, direction: "descending" | "ascending", given?: string): string {
|
||||||
if (!given) {
|
if (!given) {
|
||||||
return create(prefixes[prefix], direction)
|
return create(prefixes[prefix], direction)
|
||||||
}
|
}
|
||||||
@@ -43,9 +42,9 @@ export namespace Identifier {
|
|||||||
throw new Error(`ID ${given} does not start with ${prefixes[prefix]}`)
|
throw new Error(`ID ${given} does not start with ${prefixes[prefix]}`)
|
||||||
}
|
}
|
||||||
return given
|
return given
|
||||||
}
|
}
|
||||||
|
|
||||||
function randomBase62(length: number): string {
|
function randomBase62(length: number): string {
|
||||||
const chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
|
const chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
|
||||||
let result = ""
|
let result = ""
|
||||||
const bytes = randomBytes(length)
|
const bytes = randomBytes(length)
|
||||||
@@ -53,9 +52,9 @@ export namespace Identifier {
|
|||||||
result += chars[bytes[i] % 62]
|
result += chars[bytes[i] % 62]
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
export function create(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
|
export function create(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
|
||||||
const currentTimestamp = timestamp ?? Date.now()
|
const currentTimestamp = timestamp ?? Date.now()
|
||||||
|
|
||||||
if (currentTimestamp !== lastTimestamp) {
|
if (currentTimestamp !== lastTimestamp) {
|
||||||
@@ -74,13 +73,14 @@ export namespace Identifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return prefix + "_" + timeBytes.toString("hex") + randomBase62(LENGTH - 12)
|
return prefix + "_" + timeBytes.toString("hex") + randomBase62(LENGTH - 12)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Extract timestamp from an ascending ID. Does not work with descending IDs. */
|
/** Extract timestamp from an ascending ID. Does not work with descending IDs. */
|
||||||
export function timestamp(id: string): number {
|
export function timestamp(id: string): number {
|
||||||
const prefix = id.split("_")[0]
|
const prefix = id.split("_")[0]
|
||||||
const hex = id.slice(prefix.length + 1, prefix.length + 13)
|
const hex = id.slice(prefix.length + 1, prefix.length + 13)
|
||||||
const encoded = BigInt("0x" + hex)
|
const encoded = BigInt("0x" + hex)
|
||||||
return Number(encoded / BigInt(0x1000))
|
return Number(encoded / BigInt(0x1000))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export * as Identifier from "./id"
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ export const layer = Layer.effect(
|
|||||||
|
|
||||||
const servers: Record<string, LSPServer.Info> = {}
|
const servers: Record<string, LSPServer.Info> = {}
|
||||||
|
|
||||||
if (cfg.lsp === false) {
|
if (!cfg.lsp) {
|
||||||
log.info("all LSPs are disabled")
|
log.info("all LSPs are disabled")
|
||||||
} else {
|
} else {
|
||||||
for (const server of Object.values(LSPServer)) {
|
for (const server of Object.values(LSPServer)) {
|
||||||
@@ -440,12 +440,11 @@ export const layer = Layer.effect(
|
|||||||
const workspaceSymbol = Effect.fn("LSP.workspaceSymbol")(function* (query: string) {
|
const workspaceSymbol = Effect.fn("LSP.workspaceSymbol")(function* (query: string) {
|
||||||
const results = yield* runAll((client) =>
|
const results = yield* runAll((client) =>
|
||||||
client.connection
|
client.connection
|
||||||
.sendRequest("workspace/symbol", { query })
|
.sendRequest<Symbol[]>("workspace/symbol", { query })
|
||||||
.then((result: any) => result.filter((x: Symbol) => kinds.includes(x.kind)))
|
.then((result) => result.filter((x) => kinds.includes(x.kind)).slice(0, 10))
|
||||||
.then((result: any) => result.slice(0, 10))
|
.catch(() => [] as Symbol[]),
|
||||||
.catch(() => []),
|
|
||||||
)
|
)
|
||||||
return results.flat() as Symbol[]
|
return results.flat()
|
||||||
})
|
})
|
||||||
|
|
||||||
const prepareCallHierarchy = Effect.fn("LSP.prepareCallHierarchy")(function* (input: LocInput) {
|
const prepareCallHierarchy = Effect.fn("LSP.prepareCallHierarchy")(function* (input: LocInput) {
|
||||||
|
|||||||
@@ -124,8 +124,17 @@ export async function install(dir: string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const pkg = await Filesystem.readJson(path.join(dir, "package.json")).catch(() => ({}))
|
type PackageDeps = Record<string, string>
|
||||||
const lock = await Filesystem.readJson(path.join(dir, "package-lock.json")).catch(() => ({}))
|
type PackageJson = {
|
||||||
|
dependencies?: PackageDeps
|
||||||
|
devDependencies?: PackageDeps
|
||||||
|
peerDependencies?: PackageDeps
|
||||||
|
optionalDependencies?: PackageDeps
|
||||||
|
}
|
||||||
|
const pkg: PackageJson = await Filesystem.readJson<PackageJson>(path.join(dir, "package.json")).catch(() => ({}))
|
||||||
|
const lock: { packages?: Record<string, PackageJson> } = await Filesystem.readJson<{
|
||||||
|
packages?: Record<string, PackageJson>
|
||||||
|
}>(path.join(dir, "package-lock.json")).catch(() => ({}))
|
||||||
|
|
||||||
const declared = new Set([
|
const declared = new Set([
|
||||||
...Object.keys(pkg.dependencies || {}),
|
...Object.keys(pkg.dependencies || {}),
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import type { Hooks, PluginInput } from "@opencode-ai/plugin"
|
import type { Hooks, PluginInput } from "@opencode-ai/plugin"
|
||||||
import type { Model } from "@opencode-ai/sdk/v2"
|
import type { Model } from "@opencode-ai/sdk/v2"
|
||||||
import { Installation } from "@/installation"
|
|
||||||
import { InstallationVersion } from "@/installation/version"
|
import { InstallationVersion } from "@/installation/version"
|
||||||
import { iife } from "@/util/iife"
|
import { iife } from "@/util/iife"
|
||||||
import { Log } from "../../util"
|
import { Log } from "../../util"
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ export namespace CopilotModels {
|
|||||||
// every version looks like: `{model.id}-YYYY-MM-DD`
|
// every version looks like: `{model.id}-YYYY-MM-DD`
|
||||||
version: z.string(),
|
version: z.string(),
|
||||||
supported_endpoints: z.array(z.string()).optional(),
|
supported_endpoints: z.array(z.string()).optional(),
|
||||||
|
policy: z
|
||||||
|
.object({
|
||||||
|
state: z.string().optional(),
|
||||||
|
})
|
||||||
|
.optional(),
|
||||||
capabilities: z.object({
|
capabilities: z.object({
|
||||||
family: z.string(),
|
family: z.string(),
|
||||||
limits: z.object({
|
limits: z.object({
|
||||||
@@ -123,7 +128,9 @@ export namespace CopilotModels {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const result = { ...existing }
|
const result = { ...existing }
|
||||||
const remote = new Map(data.data.filter((m) => m.model_picker_enabled).map((m) => [m.id, m] as const))
|
const remote = new Map(
|
||||||
|
data.data.filter((m) => m.model_picker_enabled && m.policy?.state !== "disabled").map((m) => [m.id, m] as const),
|
||||||
|
)
|
||||||
|
|
||||||
// prune existing models whose api.id isn't in the endpoint response
|
// prune existing models whose api.id isn't in the endpoint response
|
||||||
for (const [key, model] of Object.entries(result)) {
|
for (const [key, model] of Object.entries(result)) {
|
||||||
|
|||||||
@@ -547,12 +547,14 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
|
|||||||
},
|
},
|
||||||
async getModel(sdk: any, modelID: string, options?: Record<string, any>) {
|
async getModel(sdk: any, modelID: string, options?: Record<string, any>) {
|
||||||
if (modelID.startsWith("duo-workflow-")) {
|
if (modelID.startsWith("duo-workflow-")) {
|
||||||
const workflowRef = options?.workflowRef as string | undefined
|
const workflowRef = typeof options?.workflowRef === "string" ? options.workflowRef : undefined
|
||||||
// Use the static mapping if it exists, otherwise use duo-workflow with selectedModelRef
|
// Use the static mapping if it exists, otherwise use duo-workflow with selectedModelRef
|
||||||
const sdkModelID = isWorkflowModel(modelID) ? modelID : "duo-workflow"
|
const sdkModelID = isWorkflowModel(modelID) ? modelID : "duo-workflow"
|
||||||
|
const workflowDefinition =
|
||||||
|
typeof options?.workflowDefinition === "string" ? options.workflowDefinition : undefined
|
||||||
const model = sdk.workflowChat(sdkModelID, {
|
const model = sdk.workflowChat(sdkModelID, {
|
||||||
featureFlags,
|
featureFlags,
|
||||||
workflowDefinition: options?.workflowDefinition as string | undefined,
|
workflowDefinition,
|
||||||
})
|
})
|
||||||
if (workflowRef) {
|
if (workflowRef) {
|
||||||
model.selectedModelRef = workflowRef
|
model.selectedModelRef = workflowRef
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { AppRuntime } from "@/effect/app-runtime"
|
|||||||
import { AsyncQueue } from "../../util/queue"
|
import { AsyncQueue } from "../../util/queue"
|
||||||
import { errors } from "../error"
|
import { errors } from "../error"
|
||||||
import { lazy } from "../../util/lazy"
|
import { lazy } from "../../util/lazy"
|
||||||
|
import { SessionID } from "@/session/schema"
|
||||||
|
|
||||||
const TuiRequest = z.object({
|
const TuiRequest = z.object({
|
||||||
path: z.string(),
|
path: z.string(),
|
||||||
@@ -371,7 +372,7 @@ export const TuiRoutes = lazy(() =>
|
|||||||
validator("json", TuiEvent.SessionSelect.properties),
|
validator("json", TuiEvent.SessionSelect.properties),
|
||||||
async (c) => {
|
async (c) => {
|
||||||
const { sessionID } = c.req.valid("json")
|
const { sessionID } = c.req.valid("json")
|
||||||
await AppRuntime.runPromise(Session.Service.use((svc) => svc.get(sessionID)))
|
await AppRuntime.runPromise(Session.Service.use((svc) => svc.get(SessionID.make(sessionID))))
|
||||||
await Bus.publish(TuiEvent.SessionSelect, { sessionID })
|
await Bus.publish(TuiEvent.SessionSelect, { sessionID })
|
||||||
return c.json(true)
|
return c.json(true)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,11 +3,10 @@ import { Bonjour } from "bonjour-service"
|
|||||||
|
|
||||||
const log = Log.create({ service: "mdns" })
|
const log = Log.create({ service: "mdns" })
|
||||||
|
|
||||||
export namespace MDNS {
|
let bonjour: Bonjour | undefined
|
||||||
let bonjour: Bonjour | undefined
|
let currentPort: number | undefined
|
||||||
let currentPort: number | undefined
|
|
||||||
|
|
||||||
export function publish(port: number, domain?: string) {
|
export function publish(port: number, domain?: string) {
|
||||||
if (currentPort === port) return
|
if (currentPort === port) return
|
||||||
if (bonjour) unpublish()
|
if (bonjour) unpublish()
|
||||||
|
|
||||||
@@ -42,9 +41,9 @@ export namespace MDNS {
|
|||||||
bonjour = undefined
|
bonjour = undefined
|
||||||
currentPort = undefined
|
currentPort = undefined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function unpublish() {
|
export function unpublish() {
|
||||||
if (bonjour) {
|
if (bonjour) {
|
||||||
try {
|
try {
|
||||||
bonjour.unpublishAll()
|
bonjour.unpublishAll()
|
||||||
@@ -56,5 +55,6 @@ export namespace MDNS {
|
|||||||
currentPort = undefined
|
currentPort = undefined
|
||||||
log.info("mDNS service unpublished")
|
log.info("mDNS service unpublished")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export * as MDNS from "./mdns"
|
||||||
|
|||||||
@@ -101,15 +101,14 @@ const app = (upgrade: UpgradeWebSocket) =>
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
export namespace ServerProxy {
|
const log = Log.Default.clone().tag("service", "server-proxy")
|
||||||
const log = Log.Default.clone().tag("service", "server-proxy")
|
|
||||||
|
|
||||||
export async function http(
|
export async function http(
|
||||||
url: string | URL,
|
url: string | URL,
|
||||||
extra: HeadersInit | undefined,
|
extra: HeadersInit | undefined,
|
||||||
req: Request,
|
req: Request,
|
||||||
workspaceID: WorkspaceID,
|
workspaceID: WorkspaceID,
|
||||||
) {
|
) {
|
||||||
if (!Workspace.isSyncing(workspaceID)) {
|
if (!Workspace.isSyncing(workspaceID)) {
|
||||||
return new Response(`broken sync connection for workspace: ${workspaceID}`, {
|
return new Response(`broken sync connection for workspace: ${workspaceID}`, {
|
||||||
status: 503,
|
status: 503,
|
||||||
@@ -150,15 +149,15 @@ export namespace ServerProxy {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function websocket(
|
export function websocket(
|
||||||
upgrade: UpgradeWebSocket,
|
upgrade: UpgradeWebSocket,
|
||||||
target: string | URL,
|
target: string | URL,
|
||||||
extra: HeadersInit | undefined,
|
extra: HeadersInit | undefined,
|
||||||
req: Request,
|
req: Request,
|
||||||
env: unknown,
|
env: unknown,
|
||||||
) {
|
) {
|
||||||
const proxy = new URL(req.url)
|
const proxy = new URL(req.url)
|
||||||
proxy.pathname = "/__workspace_ws"
|
proxy.pathname = "/__workspace_ws"
|
||||||
proxy.search = ""
|
proxy.search = ""
|
||||||
@@ -179,5 +178,6 @@ export namespace ServerProxy {
|
|||||||
}),
|
}),
|
||||||
env as never,
|
env as never,
|
||||||
)
|
)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export * as ServerProxy from "./proxy"
|
||||||
|
|||||||
@@ -17,19 +17,18 @@ globalThis.AI_SDK_LOG_WARNINGS = false
|
|||||||
|
|
||||||
initProjectors()
|
initProjectors()
|
||||||
|
|
||||||
export namespace Server {
|
const log = Log.create({ service: "server" })
|
||||||
const log = Log.create({ service: "server" })
|
|
||||||
|
|
||||||
export type Listener = {
|
export type Listener = {
|
||||||
hostname: string
|
hostname: string
|
||||||
port: number
|
port: number
|
||||||
url: URL
|
url: URL
|
||||||
stop: (close?: boolean) => Promise<void>
|
stop: (close?: boolean) => Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Default = lazy(() => create({}))
|
export const Default = lazy(() => create({}))
|
||||||
|
|
||||||
function create(opts: { cors?: string[] }) {
|
function create(opts: { cors?: string[] }) {
|
||||||
const app = new Hono()
|
const app = new Hono()
|
||||||
const runtime = adapter.create(app)
|
const runtime = adapter.create(app)
|
||||||
|
|
||||||
@@ -60,9 +59,9 @@ export namespace Server {
|
|||||||
.route("/", UIRoutes()),
|
.route("/", UIRoutes()),
|
||||||
runtime,
|
runtime,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function openapi() {
|
export async function openapi() {
|
||||||
// Build a fresh app with all routes registered directly so
|
// Build a fresh app with all routes registered directly so
|
||||||
// hono-openapi can see describeRoute metadata (`.route()` wraps
|
// hono-openapi can see describeRoute metadata (`.route()` wraps
|
||||||
// handlers when the sub-app has a custom errorHandler, which
|
// handlers when the sub-app has a custom errorHandler, which
|
||||||
@@ -79,17 +78,17 @@ export namespace Server {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
export let url: URL
|
export let url: URL
|
||||||
|
|
||||||
export async function listen(opts: {
|
export async function listen(opts: {
|
||||||
port: number
|
port: number
|
||||||
hostname: string
|
hostname: string
|
||||||
mdns?: boolean
|
mdns?: boolean
|
||||||
mdnsDomain?: string
|
mdnsDomain?: string
|
||||||
cors?: string[]
|
cors?: string[]
|
||||||
}): Promise<Listener> {
|
}): Promise<Listener> {
|
||||||
const built = create(opts)
|
const built = create(opts)
|
||||||
const server = await built.runtime.listen(opts)
|
const server = await built.runtime.listen(opts)
|
||||||
|
|
||||||
@@ -123,5 +122,6 @@ export namespace Server {
|
|||||||
return closing
|
return closing
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export * as Server from "./server"
|
||||||
|
|||||||
@@ -272,7 +272,8 @@ export const getUsage = (input: { model: Provider.Model; usage: LanguageModelUsa
|
|||||||
input.usage.inputTokenDetails?.cacheReadTokens ?? input.usage.cachedInputTokens ?? 0,
|
input.usage.inputTokenDetails?.cacheReadTokens ?? input.usage.cachedInputTokens ?? 0,
|
||||||
)
|
)
|
||||||
const cacheWriteInputTokens = safe(
|
const cacheWriteInputTokens = safe(
|
||||||
(input.usage.inputTokenDetails?.cacheWriteTokens ??
|
Number(
|
||||||
|
input.usage.inputTokenDetails?.cacheWriteTokens ??
|
||||||
input.metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
|
input.metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
|
||||||
// google-vertex-anthropic returns metadata under "vertex" key
|
// google-vertex-anthropic returns metadata under "vertex" key
|
||||||
// (AnthropicMessagesLanguageModel custom provider key from 'vertex.anthropic.messages')
|
// (AnthropicMessagesLanguageModel custom provider key from 'vertex.anthropic.messages')
|
||||||
@@ -281,7 +282,8 @@ export const getUsage = (input: { model: Provider.Model; usage: LanguageModelUsa
|
|||||||
input.metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
|
input.metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
|
||||||
// @ts-expect-error
|
// @ts-expect-error
|
||||||
input.metadata?.["venice"]?.["usage"]?.["cacheCreationInputTokens"] ??
|
input.metadata?.["venice"]?.["usage"]?.["cacheCreationInputTokens"] ??
|
||||||
0) as number,
|
0,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
// AI SDK v6 normalized inputTokens to include cached tokens across all providers
|
// AI SDK v6 normalized inputTokens to include cached tokens across all providers
|
||||||
|
|||||||
@@ -1,33 +1,10 @@
|
|||||||
import yargs from "yargs"
|
|
||||||
import { TuiThreadCommand } from "./cli/cmd/tui/thread"
|
import { TuiThreadCommand } from "./cli/cmd/tui/thread"
|
||||||
import { InstallationVersion } from "./installation/version"
|
|
||||||
import { hideBin } from "yargs/helpers"
|
|
||||||
import { Log } from "./node"
|
import { Log } from "./node"
|
||||||
|
|
||||||
Log.init({
|
Log.init({
|
||||||
print: false,
|
print: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
const cli = yargs(hideBin(process.argv))
|
console.log(TuiThreadCommand)
|
||||||
.parserConfiguration({ "populate--": true })
|
|
||||||
.scriptName("opencode")
|
console.log(performance.now())
|
||||||
.wrap(100)
|
|
||||||
.help("help", "show help")
|
|
||||||
.alias("help", "h")
|
|
||||||
.version("version", "show version number", InstallationVersion)
|
|
||||||
.alias("version", "v")
|
|
||||||
.option("print-logs", {
|
|
||||||
describe: "print logs to stderr",
|
|
||||||
type: "boolean",
|
|
||||||
})
|
|
||||||
.option("log-level", {
|
|
||||||
describe: "log level",
|
|
||||||
type: "string",
|
|
||||||
choices: ["DEBUG", "INFO", "WARN", "ERROR"],
|
|
||||||
})
|
|
||||||
.option("pure", {
|
|
||||||
describe: "run without external plugins",
|
|
||||||
type: "boolean",
|
|
||||||
})
|
|
||||||
.command(TuiThreadCommand)
|
|
||||||
.parse()
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export type Context<M extends Metadata = Metadata> = {
|
|||||||
agent: string
|
agent: string
|
||||||
abort: AbortSignal
|
abort: AbortSignal
|
||||||
callID?: string
|
callID?: string
|
||||||
extra?: { [key: string]: any }
|
extra?: { [key: string]: unknown }
|
||||||
messages: MessageV2.WithParts[]
|
messages: MessageV2.WithParts[]
|
||||||
metadata(input: { title?: string; metadata?: M }): Effect.Effect<void>
|
metadata(input: { title?: string; metadata?: M }): Effect.Effect<void>
|
||||||
ask(input: Omit<Permission.Request, "id" | "sessionID" | "tool">): Effect.Effect<void>
|
ask(input: Omit<Permission.Request, "id" | "sessionID" | "tool">): Effect.Effect<void>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export async function readText(p: string): Promise<string> {
|
|||||||
return readFile(p, "utf-8")
|
return readFile(p, "utf-8")
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function readJson<T = any>(p: string): Promise<T> {
|
export async function readJson<T = unknown>(p: string): Promise<T> {
|
||||||
return JSON.parse(await readFile(p, "utf-8"))
|
return JSON.parse(await readFile(p, "utf-8"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -757,7 +757,7 @@ test("updates config and writes to file", async () => {
|
|||||||
const newConfig = { model: "updated/model" }
|
const newConfig = { model: "updated/model" }
|
||||||
await save(newConfig as any)
|
await save(newConfig as any)
|
||||||
|
|
||||||
const writtenConfig = await Filesystem.readJson(path.join(tmp.path, "config.json"))
|
const writtenConfig = await Filesystem.readJson<{ model: string }>(path.join(tmp.path, "config.json"))
|
||||||
expect(writtenConfig.model).toBe("updated/model")
|
expect(writtenConfig.model).toBe("updated/model")
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1601,7 +1601,7 @@ export type Config = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
lsp?:
|
lsp?:
|
||||||
| false
|
| true
|
||||||
| {
|
| {
|
||||||
[key: string]:
|
[key: string]:
|
||||||
| {
|
| {
|
||||||
|
|||||||
@@ -6938,8 +6938,7 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"sessionID": {
|
"sessionID": {
|
||||||
"description": "Session ID to navigate to",
|
"description": "Session ID to navigate to",
|
||||||
"type": "string",
|
"type": "string"
|
||||||
"pattern": "^ses.*"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["sessionID"]
|
"required": ["sessionID"]
|
||||||
@@ -8511,8 +8510,7 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"sessionID": {
|
"sessionID": {
|
||||||
"description": "Session ID to navigate to",
|
"description": "Session ID to navigate to",
|
||||||
"type": "string",
|
"type": "string"
|
||||||
"pattern": "^ses.*"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["sessionID"]
|
"required": ["sessionID"]
|
||||||
@@ -11761,7 +11759,7 @@
|
|||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"const": false
|
"const": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
|||||||
Reference in New Issue
Block a user