diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index 1cf0b33..85c6901 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -303,7 +303,7 @@ validate_issue_ref() {
 
 check_opencode_session_exists() {
     local session_id="$1"
-    opencode session list 2>/dev/null | grep -q "^$session_id"
+    opencode session list --format json 2>/dev/null | grep -q "\"$session_id\""
 }
 
 kugetsu_get_pm_context() {