diff --git a/packages/opencode-plugin/package.json b/packages/opencode-plugin/package.json
index dbb80b8..50699f7 100644
--- a/packages/opencode-plugin/package.json
+++ b/packages/opencode-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opencode-agentlens",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OpenCode plugin for AgentLens — trace your coding agent's decisions, tool calls, and sessions",
   "type": "module",
   "main": "./dist/index.cjs",
diff --git a/packages/opencode-plugin/src/index.ts b/packages/opencode-plugin/src/index.ts
index c1474eb..42958a5 100644
--- a/packages/opencode-plugin/src/index.ts
+++ b/packages/opencode-plugin/src/index.ts
@@ -173,7 +173,7 @@ const plugin: Plugin = async ({ project, directory, worktree }) => {
       state.endToolCall(
         input.callID,
         truncate(output.output ?? "", config.maxOutputLength),
-        output.title ?? input.tool,
+        output.title ?? input.tool ?? "unknown-tool",
         output.metadata as unknown,
       );
     },
diff --git a/packages/opencode-plugin/src/state.ts b/packages/opencode-plugin/src/state.ts
index cc0666a..1920267 100644
--- a/packages/opencode-plugin/src/state.ts
+++ b/packages/opencode-plugin/src/state.ts
@@ -99,7 +99,7 @@ export class SessionState {
     const toolMeta = extractToolMetadata(call.tool, call.args);
 
     trace.addSpan({
-      name: title,
+      name: title || call.tool || "unknown-tool",
       type: SpanType.TOOL_CALL,
       parentSpanId: rootSpanId,
       input: safeJsonValue(call.args),