anomalyco · Hona · Jan 2, 2026 · Jan 2, 2026 · Jan 2, 2026 · Jan 2, 2026
diff --git a/bun.lock b/bun.lock
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
@@ -9,6 +9,9 @@
     "test": "bun test",
     "build": "bun run script/build.ts",
     "dev": "bun run --conditions=browser ./src/index.ts",
+    "aspire:start": "docker run --rm -d -p 18888:18888 -p 4317:18889 -e ASPIRE_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true --name aspire-dashboard mcr.microsoft.com/dotnet/aspire-dashboard:latest && echo 'Aspire Dashboard: http://localhost:18888'",
+    "aspire:stop": "docker stop aspire-dashboard 2>/dev/null || true",
+    "dev:otel": "bun run aspire:start; OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317 OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true bun dev",
     "random": "echo 'Random script updated at $(date)' && echo 'Change queued successfully' && echo 'Another change made' && echo 'Yet another change' && echo 'One more change' && echo 'Final change' && echo 'Another final change' && echo 'Yet another final change'",
     "clean": "echo 'Cleaning up...' && rm -rf node_modules dist",
     "lint": "echo 'Running lint checks...' && bun test --coverage",
@@ -80,6 +83,14 @@
     "@opencode-ai/sdk": "workspace:*",
     "@opencode-ai/util": "workspace:*",
     "@openrouter/ai-sdk-provider": "1.5.2",
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/api-logs": "0.208.0",
+    "@opentelemetry/sdk-logs": "0.208.0",
+    "@opentelemetry/resources": "2.2.0",
+    "@opentelemetry/sdk-node": "0.208.0",
+    "@opentelemetry/semantic-conventions": "1.37.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.208.0",
+    "@opentelemetry/exporter-logs-otlp-grpc": "0.208.0",
     "@opentui/core": "0.1.67",
     "@opentui/solid": "0.1.67",
     "@parcel/watcher": "2.5.1",

diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts
@@ -12,6 +12,7 @@ import PROMPT_SUMMARY from "./prompt/summary.txt"
 import PROMPT_TITLE from "./prompt/title.txt"
 import { PermissionNext } from "@/permission/next"
 import { mergeDeep, pipe, sortBy, values } from "remeda"
+import { Telemetry } from "@/telemetry"
 
 export namespace Agent {
   export const Info = z
@@ -207,40 +208,52 @@ export namespace Agent {
   }
 
   export async function generate(input: { description: string; model?: { providerID: string; modelID: string } }) {
-    const cfg = await Config.get()
     const defaultModel = input.model ?? (await Provider.defaultModel())
-    const model = await Provider.getModel(defaultModel.providerID, defaultModel.modelID)
-    const language = await Provider.getLanguage(model)
-    const system = SystemPrompt.header(defaultModel.providerID)
-    system.push(PROMPT_GENERATE)
-    const existing = await list()
-    const result = await generateObject({
-      experimental_telemetry: {
-        isEnabled: cfg.experimental?.openTelemetry,
-        metadata: {
-          userId: cfg.username ?? "unknown",
-        },
+    return Telemetry.withSpan(
+      "agent.generate",
+      {
+        "llm.provider_id": defaultModel.providerID,
+        "llm.model_id": defaultModel.modelID,
       },
-      temperature: 0.3,
-      messages: [
-        ...system.map(
-          (item): ModelMessage => ({
-            role: "system",
-            content: item,
+      async () => {
+        const cfg = await Config.get()
+        const model = await Provider.getModel(defaultModel.providerID, defaultModel.modelID)
+        const language = await Provider.getLanguage(model)
+        const system = SystemPrompt.header(defaultModel.providerID)
+        system.push(PROMPT_GENERATE)
+        const existing = await list()
+        const result = await generateObject({
+          experimental_telemetry: {
+            isEnabled:
+              typeof cfg.experimental?.openTelemetry === "object"
+                ? cfg.experimental.openTelemetry.enabled
+                : cfg.experimental?.openTelemetry,
+            metadata: {
+              userId: cfg.username ?? "unknown",
+            },
+          },
+          temperature: 0.3,
+          messages: [
+            ...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(),
           }),
-        ),
-        {
-          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(),
-      }),
-    })
-    return result.object
+        })
+        return result.object
+      },
+    )
   }
 }
diff --git a/packages/opencode/src/cli/cmd/tui/worker.ts b/packages/opencode/src/cli/cmd/tui/worker.ts
@@ -17,6 +17,16 @@ await Log.init({
   })(),
 })
 
+// Initialize telemetry if enabled via env var or config
+const otelEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT
+const globalConfig = otelEndpoint ? undefined : await Config.global()
+const otelConfig = globalConfig?.experimental?.openTelemetry
+if (otelEndpoint || otelConfig) {
+  const { Telemetry } = await import("@/telemetry")
+  const config = Telemetry.resolveConfig("opencode-server", otelConfig)
+  Telemetry.init(config)
+}
+
 process.on("unhandledRejection", (e) => {
   Log.Default.error("rejection", {
     e: e instanceof Error ? e.message : e,
@@ -58,7 +68,10 @@ export const rpc = {
   },
   async shutdown() {
     Log.Default.info("worker shutting down")
+    Log.Default.info("disposing all instances")
     await Instance.disposeAll()
+    const { Telemetry } = await import("@/telemetry")
+    await Telemetry.shutdown()
     // TODO: this should be awaited, but ws connections are
     // causing this to hang, need to revisit this
     server.stop(true)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
@@ -910,9 +910,15 @@ export namespace Config {
           disable_paste_summary: z.boolean().optional(),
           batch_tool: z.boolean().optional().describe("Enable the batch tool"),
           openTelemetry: z
-            .boolean()
+            .union([
+              z.boolean(),
+              z.object({
+                enabled: z.boolean().optional().default(true),
+                endpoint: z.string().optional().describe("OTLP endpoint (default: http://localhost:4317)"),
+              }),
+            ])
             .optional()
-            .describe("Enable OpenTelemetry spans for AI SDK calls (using the 'experimental_telemetry' flag)"),
+            .describe("Enable OpenTelemetry tracing and structured logs to Aspire Dashboard"),
           primary_tools: z
             .array(z.string())
             .optional()

diff --git a/packages/opencode/src/index.ts b/packages/opencode/src/index.ts
@@ -27,6 +27,8 @@ import { EOL } from "os"
 import { WebCommand } from "./cli/cmd/web"
 import { PrCommand } from "./cli/cmd/pr"
 import { SessionCommand } from "./cli/cmd/session"
+import { Config } from "./config/config"
+import { Telemetry } from "./telemetry"
 
 process.on("unhandledRejection", (e) => {
   Log.Default.error("rejection", {
@@ -40,6 +42,14 @@ process.on("uncaughtException", (e) => {
   })
 })
 
+process.on("SIGTERM", async () => {
+  await Telemetry.shutdown()
+})
+
+process.on("SIGINT", async () => {
+  await Telemetry.shutdown()
+})
+
 const cli = yargs(hideBin(process.argv))
   .parserConfiguration({ "populate--": true })
   .scriptName("opencode")
@@ -75,6 +85,15 @@ const cli = yargs(hideBin(process.argv))
       version: Installation.VERSION,
       args: process.argv.slice(2),
     })
+
+    // Initialize telemetry if enabled via env var or config
+    const otelEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT
+    const globalConfig = otelEndpoint ? undefined : await Config.global()
+    const otelConfig = globalConfig?.experimental?.openTelemetry
+    if (otelEndpoint || otelConfig) {
+      const config = Telemetry.resolveConfig("opencode-cli", otelConfig)
+      Telemetry.init(config)
+    }
   })
   .usage("\n" + UI.logo())
   .completion("completion", "generate shell completion script")
@@ -151,6 +170,8 @@ try {
   }
   process.exitCode = 1
 } finally {
+  // Shutdown telemetry before exit
+  await Telemetry.shutdown()
   // Some subprocesses don't react properly to SIGTERM and similar signals.
   // Most notably, some docker-container-based MCP servers don't handle such signals unless
   // run using `docker run --init`.