diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index df1b4b9..5f1b473 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -1102,6 +1102,8 @@ EOF
     echo "Initialization complete!"
     echo "- Base session: $new_session_id"
     echo "- PM agent: ${new_pm_session_id:-created by hermes}"
+    
+    fix_session_permissions
 }
 
 cmd_start() {
diff --git a/skills/kugetsu/tests/test-kugetsu-v2.sh b/skills/kugetsu/tests/test-kugetsu-v2.sh
index 6ee0b4f..964f2a3 100644
--- a/skills/kugetsu/tests/test-kugetsu-v2.sh
+++ b/skills/kugetsu/tests/test-kugetsu-v2.sh
@@ -637,6 +637,25 @@ echo ""
 # Cleanup env files
 rm -rf ~/.kugetsu/env 2>/dev/null || true
 
+# Test E7: fix_session_permissions function exists
+echo "--- Test: fix_session_permissions function exists ---"
+if grep -q "fix_session_permissions()" "$KUGETSU"; then
+    pass "fix_session_permissions function exists"
+else
+    fail "fix_session_permissions function not found"
+fi
+echo ""
+
+# Test E8: cmd_doctor --fix-permissions flag is recognized
+echo "--- Test: cmd_doctor --fix-permissions flag ---"
+OUTPUT=$($KUGETSU doctor --fix-permissions 2>&1 || true)
+if echo "$OUTPUT" | grep -q -E "(Fixing session permissions|Session permissions fix complete|opencode database not found)"; then
+    pass "cmd_doctor --fix-permissions flag is recognized"
+else
+    fail "cmd_doctor --fix-permissions not recognized: $OUTPUT"
+fi
+echo ""
+
 # Cleanup
 cleanup