feat(server): expose location paths
This commit is contained in:
parent
6e8aefcfa0
commit
a7855aa169
7 changed files with 65 additions and 1 deletions
|
|
@ -30,6 +30,7 @@ import { CredentialGroup } from "./groups/credential.js"
|
|||
import { ProjectGroup } from "./groups/project.js"
|
||||
import { ProjectCopyGroup } from "./groups/project-copy.js"
|
||||
import { VcsGroup } from "./groups/vcs.js"
|
||||
import { PathGroup } from "./groups/path.js"
|
||||
|
||||
type LocationGroups<LocationId extends HttpApiMiddleware.AnyId> =
|
||||
| HttpApiGroup.AddMiddleware<typeof LocationGroup, LocationId>
|
||||
|
|
@ -50,6 +51,7 @@ type LocationGroups<LocationId extends HttpApiMiddleware.AnyId> =
|
|||
| HttpApiGroup.AddMiddleware<typeof ReferenceGroup, LocationId>
|
||||
| HttpApiGroup.AddMiddleware<typeof ProjectCopyGroup, LocationId>
|
||||
| HttpApiGroup.AddMiddleware<typeof VcsGroup, LocationId>
|
||||
| HttpApiGroup.AddMiddleware<typeof PathGroup, LocationId>
|
||||
|
||||
type SessionGroups<SessionLocationId extends HttpApiMiddleware.AnyId, SessionLocationService> =
|
||||
| ReturnType<typeof makeSessionGroup<SessionLocationId, SessionLocationService>>
|
||||
|
|
@ -168,6 +170,7 @@ const makeApiFromGroup = <
|
|||
.add(ReferenceGroup.middleware(locationMiddleware))
|
||||
.add(ProjectCopyGroup.middleware(locationMiddleware))
|
||||
.add(VcsGroup.middleware(locationMiddleware))
|
||||
.add(PathGroup.middleware(locationMiddleware))
|
||||
.add(DebugGroup)
|
||||
.annotateMerge(
|
||||
OpenApi.annotations({
|
||||
|
|
|
|||
20
packages/protocol/src/groups/path.ts
Normal file
20
packages/protocol/src/groups/path.ts
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import { Path } from "@opencode-ai/schema/path"
|
||||
import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
|
||||
import { LocationQuery, locationQueryOpenApi } from "./location.js"
|
||||
|
||||
export const PathGroup = HttpApiGroup.make("server.path")
|
||||
.add(
|
||||
HttpApiEndpoint.get("path.get", "/api/path", {
|
||||
query: LocationQuery,
|
||||
success: Path.Info,
|
||||
})
|
||||
.annotateMerge(locationQueryOpenApi)
|
||||
.annotateMerge(
|
||||
OpenApi.annotations({
|
||||
identifier: "v2.path.get",
|
||||
summary: "Get paths",
|
||||
description: "Get process and location paths.",
|
||||
}),
|
||||
),
|
||||
)
|
||||
.annotateMerge(OpenApi.annotations({ title: "path", description: "Location and process paths." }))
|
||||
|
|
@ -14,6 +14,7 @@ export { Model } from "./model.js"
|
|||
export { Money } from "./money.js"
|
||||
export { Permission } from "./permission.js"
|
||||
export { PermissionSaved } from "./permission-saved.js"
|
||||
export { Path } from "./path.js"
|
||||
export { Project } from "./project.js"
|
||||
export { ProjectCopy } from "./project-copy.js"
|
||||
export { Provider } from "./provider.js"
|
||||
|
|
|
|||
13
packages/schema/src/path.ts
Normal file
13
packages/schema/src/path.ts
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
export * as Path from "./path.js"
|
||||
|
||||
import { Schema } from "effect"
|
||||
import { AbsolutePath } from "./schema.js"
|
||||
|
||||
export const Info = Schema.Struct({
|
||||
home: AbsolutePath,
|
||||
state: AbsolutePath,
|
||||
config: AbsolutePath,
|
||||
worktree: AbsolutePath,
|
||||
directory: AbsolutePath,
|
||||
}).annotate({ identifier: "Path.Info" })
|
||||
export interface Info extends Schema.Schema.Type<typeof Info> {}
|
||||
|
|
@ -26,6 +26,7 @@ import { CredentialHandler } from "./handlers/credential"
|
|||
import { ProjectHandler } from "./handlers/project"
|
||||
import { ProjectCopyHandler } from "./handlers/project-copy"
|
||||
import { VcsHandler } from "./handlers/vcs"
|
||||
import { PathHandler } from "./handlers/path"
|
||||
import { EventFeed } from "./event-feed"
|
||||
|
||||
export const handlers = Layer.mergeAll(
|
||||
|
|
@ -56,4 +57,5 @@ export const handlers = Layer.mergeAll(
|
|||
ReferenceHandler,
|
||||
ProjectCopyHandler,
|
||||
VcsHandler,
|
||||
PathHandler,
|
||||
)
|
||||
|
|
|
|||
22
packages/server/src/handlers/path.ts
Normal file
22
packages/server/src/handlers/path.ts
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
import { Location } from "@opencode-ai/core/location"
|
||||
import { AbsolutePath } from "@opencode-ai/core/schema"
|
||||
import { Global } from "@opencode-ai/util/global"
|
||||
import { Effect } from "effect"
|
||||
import { HttpApiBuilder } from "effect/unstable/httpapi"
|
||||
import { Api } from "../api"
|
||||
|
||||
export const PathHandler = HttpApiBuilder.group(Api, "server.path", (handlers) =>
|
||||
handlers.handle("path.get", () =>
|
||||
Effect.gen(function* () {
|
||||
const global = yield* Global.Service
|
||||
const location = yield* Location.Service
|
||||
return {
|
||||
home: AbsolutePath.make(global.home),
|
||||
state: AbsolutePath.make(global.state),
|
||||
config: AbsolutePath.make(global.config),
|
||||
worktree: location.project.directory,
|
||||
directory: location.directory,
|
||||
}
|
||||
}),
|
||||
),
|
||||
)
|
||||
|
|
@ -60,6 +60,7 @@ const applicationServices = LayerNode.group([
|
|||
WellKnown.node,
|
||||
PtyEnvironment.node,
|
||||
LocationServiceMap.node,
|
||||
Global.node,
|
||||
SessionRestart.node,
|
||||
])
|
||||
|
||||
|
|
@ -134,7 +135,9 @@ function makeRoutes<AuthError, AuthServices>(
|
|||
Layer.flatMap((context) => {
|
||||
const services = Layer.succeedContext(context)
|
||||
const requestServices = Layer.merge(
|
||||
Layer.succeedContext(Context.pick(PermissionSaved.Service, Project.Service, WellKnown.Service)(context)),
|
||||
Layer.succeedContext(
|
||||
Context.pick(Global.Service, PermissionSaved.Service, Project.Service, WellKnown.Service)(context),
|
||||
),
|
||||
ServerInfo.layer(serviceURLs, options.app),
|
||||
)
|
||||
return HttpApiBuilder.layer(Api, { openapiPath: "/openapi.json" }).pipe(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue