diff --git a/packages/cli/test/service.test.ts b/packages/cli/test/service.test.ts index d69cfd86c60..c1e3a2ad6ee 100644 --- a/packages/cli/test/service.test.ts +++ b/packages/cli/test/service.test.ts @@ -431,6 +431,7 @@ test("concurrent service processes elect one server", async () => { ).toEqual({ version: info.version, pid: info.pid, + hostname: os.hostname(), urls: [info.url], // The server reports the canonical tmp directory; Windows os.tmpdir() can be an 8.3 short name. paths: { tmp: await fs.realpath(path.join(os.tmpdir(), "opencode")) }, diff --git a/packages/client/src/effect/api/api.ts b/packages/client/src/effect/api/api.ts index 583d78f9427..d26ce6e5009 100644 --- a/packages/client/src/effect/api/api.ts +++ b/packages/client/src/effect/api/api.ts @@ -46,6 +46,7 @@ import type { Config } from "@opencode/schema/config" export type ServerInfoOutput = { readonly version: string readonly pid: number + readonly hostname?: string | undefined readonly urls: ReadonlyArray readonly paths: { readonly tmp: string } readonly capabilities?: { readonly persistentPty?: boolean | undefined } | undefined diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts index 303f8e07afa..c10f30e54e2 100644 --- a/packages/client/src/promise/generated/types.ts +++ b/packages/client/src/promise/generated/types.ts @@ -3,6 +3,7 @@ export type JsonValue = null | boolean | number | string | Array | { export type ServerInfo = { version: string pid: number + hostname?: string | undefined urls: Array paths: { tmp: string } capabilities?: { persistentPty?: boolean | undefined } | undefined diff --git a/packages/protocol/openapi.json b/packages/protocol/openapi.json index 48964f54d3e..39457a317ff 100644 --- a/packages/protocol/openapi.json +++ b/packages/protocol/openapi.json @@ -19138,6 +19138,16 @@ "type": "integer", "minimum": 0 }, + "hostname": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + }, "urls": { "type": "array", "items": { diff --git a/packages/protocol/src/groups/server.ts b/packages/protocol/src/groups/server.ts index 4b4cab189bf..d78813bfc8b 100644 --- a/packages/protocol/src/groups/server.ts +++ b/packages/protocol/src/groups/server.ts @@ -6,6 +6,8 @@ export const ServerInfo = Schema.Struct({ version: Schema.String, // 0 means the runtime has no OS process identity (e.g. workerd). pid: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)), + // The machine's name, absent where the runtime has none (e.g. workerd). + hostname: Schema.optional(Schema.String), urls: Schema.Array(Schema.String), paths: Schema.Struct({ tmp: Schema.String, diff --git a/packages/server/src/handlers/server.ts b/packages/server/src/handlers/server.ts index d85594b38d4..7487581e70d 100644 --- a/packages/server/src/handlers/server.ts +++ b/packages/server/src/handlers/server.ts @@ -1,3 +1,4 @@ +import { hostname } from "node:os" import { Duration, Effect } from "effect" import { HttpServerRequest, HttpServerResponse } from "effect/http" import { HttpApiBuilder } from "effect/http-api" @@ -20,6 +21,7 @@ export const ServerHandler = HttpApiBuilder.group(Api, "server.server", (handler return { version: info.app.version ?? "unknown", pid: process.pid ?? 0, + hostname: hostname() || undefined, urls: info.urls(), paths: info.paths, capabilities: { persistentPty: PersistentPty.available },