Skip to content
Draft
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
63 changes: 63 additions & 0 deletions bun.lock

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

7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
"packages/slack"
],
"catalog": {
"@effect/opentelemetry": "4.0.0-beta.46",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-trace-otlp-http": "0.211.0",
"@opentelemetry/resources": "2.5.0",
"@opentelemetry/sdk-trace-base": "2.5.0",
"@opentelemetry/sdk-trace-node": "2.5.0",
"@opentelemetry/semantic-conventions": "1.39.0",
"@effect/platform-node": "4.0.0-beta.46",
"@types/bun": "1.3.11",
"@types/cross-spawn": "6.0.6",
Expand Down
7 changes: 7 additions & 0 deletions packages/opencode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,14 @@
"@ai-sdk/xai": "3.0.75",
"@aws-sdk/credential-providers": "3.993.0",
"@clack/prompts": "1.0.0-alpha.1",
"@effect/opentelemetry": "catalog:",
"@effect/platform-node": "catalog:",
"@opentelemetry/api": "catalog:",
"@opentelemetry/exporter-trace-otlp-http": "catalog:",
"@opentelemetry/resources": "catalog:",
"@opentelemetry/sdk-trace-base": "catalog:",
"@opentelemetry/sdk-trace-node": "catalog:",
"@opentelemetry/semantic-conventions": "catalog:",
"@gitlab/opencode-gitlab-auth": "1.3.3",
"@hono/node-server": "1.19.11",
"@hono/node-ws": "1.3.0",
Expand Down
74 changes: 41 additions & 33 deletions packages/opencode/src/agent/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import { Plugin } from "@/plugin"
import { Skill } from "../skill"
import { Effect, Context, Layer } from "effect"
import { InstanceState } from "@/effect/instance-state"
import { Observability } from "@/effect/oltp"
import { makeRuntime } from "@/effect/run-service"
import type { Tracer } from "@opentelemetry/api"

export namespace Agent {
export const Info = z
Expand Down Expand Up @@ -345,38 +347,42 @@ export namespace Agent {
const authInfo = yield* auth.get(model.providerID).pipe(Effect.orDie)
const isOpenaiOauth = model.providerID === "openai" && authInfo?.type === "oauth"

const params = {
experimental_telemetry: {
isEnabled: cfg.experimental?.openTelemetry,
metadata: {
userId: cfg.username ?? "unknown",
},
},
temperature: 0.3,
messages: [
...(isOpenaiOauth
? []
: system.map(
(item): ModelMessage => ({
role: "system",
content: item,
}),
)),
{
role: "user",
content: `Create an agent configuration based on this request: \"${input.description}\".\n\nIMPORTANT: The following identifiers already exist and must NOT be used: ${existing.map((i) => i.name).join(", ")}\n Return ONLY the JSON object, no other text, do not wrap in backticks`,
},
],
model: language,
schema: z.object({
identifier: z.string(),
whenToUse: z.string(),
systemPrompt: z.string(),
}),
} satisfies Parameters<typeof generateObject>[0]
const run = async (tracer: Tracer) => {
const params = {
experimental_telemetry: Observability.aiTelemetry({
enabled: cfg.experimental?.openTelemetry,
tracer,
functionId: "Agent.generate",
metadata: {
userID: cfg.username ?? "unknown",
providerID: resolved.providerID,
modelID: resolved.id,
},
}),
temperature: 0.3,
messages: [
...(isOpenaiOauth
? []
: system.map(
(item): ModelMessage => ({
role: "system",
content: item,
}),
)),
{
role: "user",
content: `Create an agent configuration based on this request: \"${input.description}\".\n\nIMPORTANT: The following identifiers already exist and must NOT be used: ${existing.map((i) => i.name).join(", ")}\n Return ONLY the JSON object, no other text, do not wrap in backticks`,
},
],
model: language,
schema: z.object({
identifier: z.string(),
whenToUse: z.string(),
systemPrompt: z.string(),
}),
} satisfies Parameters<typeof generateObject>[0]

if (isOpenaiOauth) {
return yield* Effect.promise(async () => {
if (isOpenaiOauth) {
const result = streamObject({
...params,
providerOptions: ProviderTransform.providerOptions(resolved, {
Expand All @@ -389,10 +395,12 @@ export namespace Agent {
if (part.type === "error") throw part.error
}
return result.object
})
}

return generateObject(params).then((r) => r.object)
}

return yield* Effect.promise(() => generateObject(params).then((r) => r.object))
return yield* Observability.promise(run)
}),
})
}),
Expand Down
Loading
Loading