diff --git a/apps/copilot/plugin.json b/apps/copilot/plugin.json
index 0cbba84e..1afa5760 100644
--- a/apps/copilot/plugin.json
+++ b/apps/copilot/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "plannotator-copilot",
   "description": "Interactive Plan & Code Review for GitHub Copilot CLI. Visual annotations, team sharing, structured feedback.",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "author": { "name": "backnotprop" },
   "repository": "https://github.com/backnotprop/plannotator",
   "license": "MIT OR Apache-2.0",
diff --git a/apps/hook/.claude-plugin/plugin.json b/apps/hook/.claude-plugin/plugin.json
index 0d4bf265..a3b3094a 100644
--- a/apps/hook/.claude-plugin/plugin.json
+++ b/apps/hook/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "plannotator",
   "description": "Interactive Plan Review: Mark up and refine your plans using a UI, easily share for team collaboration, automatically integrates with plan mode hooks.",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "author": {
     "name": "backnotprop"
   },
diff --git a/apps/opencode-plugin/package.json b/apps/opencode-plugin/package.json
index df003764..15498a02 100644
--- a/apps/opencode-plugin/package.json
+++ b/apps/opencode-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/opencode",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "description": "Plannotator plugin for OpenCode - interactive plan review with visual annotation",
   "author": "backnotprop",
   "license": "MIT OR Apache-2.0",
diff --git a/apps/pi-extension/package.json b/apps/pi-extension/package.json
index a00f62a6..27717c22 100644
--- a/apps/pi-extension/package.json
+++ b/apps/pi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/pi-extension",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "type": "module",
   "description": "Plannotator extension for Pi coding agent - interactive plan review with visual annotation",
   "author": "backnotprop",
diff --git a/openpackage.yml b/openpackage.yml
index 4c3c262b..cf0cb990 100644
--- a/openpackage.yml
+++ b/openpackage.yml
@@ -1,5 +1,5 @@
 name: plannotator
-version: 0.17.5
+version: 0.17.6
 description: Annotate Claude Code and other agent plans and review code visually. Share with your team, and send feedback to your agent with one click
 author: backnotprop
 license: MIT/Apache2.0
diff --git a/package.json b/package.json
index 77ccc7c8..a519352d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plannotator",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "private": true,
   "description": "Interactive Plan Review for Claude Code - annotate plans visually, share with team, automatically send feedback",
   "author": "backnotprop",
diff --git a/packages/server/annotate.ts b/packages/server/annotate.ts
index 6d6b697d..84e7a380 100644
--- a/packages/server/annotate.ts
+++ b/packages/server/annotate.ts
@@ -249,6 +249,14 @@ export async function startAnnotateServer(
             headers: { "Content-Type": "text/html" },
           });
         },
+
+        error(err) {
+          console.error("[plannotator] Server error:", err);
+          return new Response(
+            `Internal Server Error: ${err instanceof Error ? err.message : String(err)}`,
+            { status: 500, headers: { "Content-Type": "text/plain" } },
+          );
+        },
       });
 
       break; // Success, exit retry loop
diff --git a/packages/server/index.ts b/packages/server/index.ts
index 3805833f..91f01f5d 100644
--- a/packages/server/index.ts
+++ b/packages/server/index.ts
@@ -535,6 +535,14 @@ export async function startPlannotatorServer(
             headers: { "Content-Type": "text/html" },
           });
         },
+
+        error(err) {
+          console.error("[plannotator] Server error:", err);
+          return new Response(
+            `Internal Server Error: ${err instanceof Error ? err.message : String(err)}`,
+            { status: 500, headers: { "Content-Type": "text/plain" } },
+          );
+        },
       });
 
       break; // Success, exit retry loop
diff --git a/packages/server/package.json b/packages/server/package.json
index 2c6dcf7f..dc979e7b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/server",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "private": true,
   "description": "Shared server implementation for Plannotator plugins",
   "main": "index.ts",
diff --git a/packages/server/review.ts b/packages/server/review.ts
index 21287e38..0726896e 100644
--- a/packages/server/review.ts
+++ b/packages/server/review.ts
@@ -660,6 +660,14 @@ export async function startReviewServer(
             headers: { "Content-Type": "text/html" },
           });
         },
+
+        error(err) {
+          console.error("[plannotator] Server error:", err);
+          return new Response(
+            `Internal Server Error: ${err instanceof Error ? err.message : String(err)}`,
+            { status: 500, headers: { "Content-Type": "text/plain" } },
+          );
+        },
       });
 
       break; // Success, exit retry loop